Changeset 47d3b0b in nscp

Timestamp:

03/02/11 20:03:32 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

197b263

Parents:

01c5d0a

Message:

Fixed installer (almost works now from CMake but dll:s are still missing)

Files:

• CMakeLists.txt (modified) (6 diffs)
• build/cmake/wix.cmake (added)
• helpers/installers/installer/Bitmaps/Thumbs.db (added)
• helpers/installers/installer/Bitmaps/bannrbmp.bmp (added)
• helpers/installers/installer/Bitmaps/bannrbmp.psd (added)
• helpers/installers/installer/Bitmaps/dlgbmp.bmp (added)
• helpers/installers/installer/Bitmaps/dlgbmp.psd (added)
• helpers/installers/installer/Bitmaps/exclamic.ico (added)
• helpers/installers/installer/Bitmaps/info.ico (added)
• helpers/installers/installer/Bitmaps/new.ico (added)
• helpers/installers/installer/Bitmaps/up.ico (added)
• helpers/installers/installer/CMakeLists.txt (added)
• helpers/installers/installer/License.rtf (added)
• helpers/installers/installer/Product.wxs (added)
• helpers/installers/installer/WixUI.wixlib (added)
• helpers/installers/installer/WixUI_en-us.wxl (added)
• helpers/installers/installer/config.wxs (added)
• helpers/installers/installer/help.ico (added)
• helpers/installers/installer/module.cmake (added)
• helpers/installers/installer/properties.wxs (added)
• helpers/installers/installer/wixca.dll (added)

CMakeLists.txt

@@ -72 +72 @@
 # ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ###
 
+if (WIN32)
+    include(${BUILD_CMAKE_FOLDER}/wix.cmake)
+endif(WIN32)
 
 INCLUDE(${BUILD_CMAKE_FOLDER}/SetMultiThread.cmake)
@@ -357 +360 @@
 
 MESSAGE(STATUS "Build path: ${PROJECT_BINARY_DIR}")
+SET(NSCP_PROJECT_BINARY_DIR ${PROJECT_BINARY_DIR})
 ADD_SUBDIRECTORY("service")
 SET(MAIN_NSCP_TARGET "nscp")
@@ -364 +368 @@
 
 SET(ALL_MODULE_NAMES)
-SET(BUILD_MODULE 0)
-SET(BUILD_MODULE_SKIP_REASON "")
 FILE(GLOB ALL_MODULES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "modules/*/module.cmake")
 foreach(CURRENT_MODULE ${ALL_MODULES})
@@ -371 +373 @@
   get_filename_component(CURRENT_MODULE_NAME ${CURRENT_MODULE_PATH} NAME)
   SET (BUILD_MODULE 0)
+  SET(BUILD_MODULE_SKIP_REASON "")
   include(${CURRENT_MODULE})
   IF(BUILD_MODULE)
@@ -387 +390 @@
   get_filename_component(CURRENT_MODULE_NAME ${CURRENT_MODULE_PATH} NAME)
   SET (BUILD_MODULE 0)
+  SET(BUILD_MODULE_SKIP_REASON "")
   include(${CURRENT_MODULE})
   IF(BUILD_MODULE)
@@ -397 +401 @@
 endforeach(CURRENT_MODULE ${ALL_TOOLS})
 
+SET(ALL_INSTALLERS_NAMES)
+FILE(GLOB ALL_INSTALLERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "helpers/installers/*/module.cmake")
+foreach(CURRENT_MODULE ${ALL_INSTALLERS})
+  get_filename_component(CURRENT_MODULE_PATH ${CURRENT_MODULE} PATH)
+  get_filename_component(CURRENT_MODULE_NAME ${CURRENT_MODULE_PATH} NAME)
+  SET(BUILD_MODULE 0)
+  SET(BUILD_MODULE_SKIP_REASON "")
+  include(${CURRENT_MODULE})
+  IF(BUILD_MODULE)
+    message(STATUS "+ Installer ${CURRENT_MODULE_NAME}: Added")
+    ADD_SUBDIRECTORY("${CURRENT_MODULE_PATH}")
+    SET(ALL_INSTALLERS_NAMES ${ALL_INSTALLERS_NAMES} ${CURRENT_MODULE_NAME})
+  ELSE(BUILD_MODULE)
+    message(STATUS "- Installer ${CURRENT_MODULE_NAME}: Skipped ${BUILD_MODULE_SKIP_REASON}")
+  ENDIF(BUILD_MODULE)
+endforeach(CURRENT_MODULE ${ALL_MODULES})
+
 
 SET_TARGET_PROPERTIES(${MAIN_NSCP_TARGET} ${ALL_MODULE_NAMES} ${ALL_TOOL_NAMES} PROPERTIES