certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] certi CMakeLists.txt


From: CERTI CVS commits
Subject: [certi-cvs] certi CMakeLists.txt
Date: Sun, 05 Feb 2012 11:43:33 +0000

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      12/02/05 11:43:32

Modified files:
        .              : CMakeLists.txt 

Log message:
        Check whether if NSIS is installed before trying to build NSIS package

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.115&r2=1.116

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- CMakeLists.txt      26 Jan 2012 21:39:01 -0000      1.115
+++ CMakeLists.txt      5 Feb 2012 11:43:25 -0000       1.116
@@ -432,7 +432,15 @@
 
 IF (WIN32)
     SET(CPACK_SOURCE_GENERATOR "ZIP")
-    SET(CPACK_GENERATOR "NSIS;ZIP")
+    SET(CPACK_GENERATOR "ZIP")
+    # Add NSIS generator iff makensis is found on the system
+    find_program(MAKENSIS_EXECUTABLE
+                 NAMES makensis
+                 DOC "The NSIS package maker command")
+    if (MAKENSIS_EXECUTABLE)
+      list(APPEND CPACK_GENERATOR "NSIS")
+    endif(MAKENSIS_EXECUTABLE)
+
     ## Add a custom target callable from IDE (Mostly for Visual Studio)
     GET_FILENAME_COMPONENT(CPACK_COMMAND ${CMAKE_COMMAND} PATH)
     SET(CPACK_COMMAND ${CPACK_COMMAND}/cpack)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]