diff --git a/CMakeLists.txt b/CMakeLists.txt index 480691f..9bd789d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,13 @@ SET (MAJOR 0) SET (MINOR 0) SET (PATCH 0) +ExternalProject_Add (desktop + SOURCE_DIR ${CMAKE_SOURCE_DIR}/desktop + #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle +# PREFIX desktop + INSTALL_DIR bundle +) ExternalProject_Add (core SOURCE_DIR ${CMAKE_SOURCE_DIR}/core @@ -22,6 +29,30 @@ ExternalProject_Add (core INSTALL_DIR bundle ) +ExternalProject_Add (latex-struct + SOURCE_DIR ${CMAKE_SOURCE_DIR}/latex-struct + #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle +# PREFIX latex-struct + INSTALL_DIR bundle +) + +ExternalProject_Add (object-example + SOURCE_DIR ${CMAKE_SOURCE_DIR}/object-example + #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle +# PREFIX object-example + INSTALL_DIR bundle +) + +ExternalProject_Add (data-example + SOURCE_DIR ${CMAKE_SOURCE_DIR}/data-example + #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle +# PREFIX data-example + INSTALL_DIR bundle +) + INSTALL (DIRECTORY ${CMAKE_BINARY_DIR}/bundle DESTINATION "win32") diff --git a/cpack/CMakeLists.txt b/cpack/CMakeLists.txt index 927784f..ae9379c 100644 --- a/cpack/CMakeLists.txt +++ b/cpack/CMakeLists.txt @@ -4,8 +4,8 @@ SET (WIN32_UNINSTALL_NAME "LAvBundl") # <= 8 symbols for the name SET (CPACK_NSIS_MENU_LINKS "https://redmine.backbone.ws/projects/laview/wiki" "Homepage for ${PROJECT_DESCRIPTION}") -SET (CPACK_PACKAGE_EXECUTABLES "laview-desktop-1;LAview Desktop") -SET (CPACK_NSIS_INSTALLED_ICON_NAME bin\\\\laview-desktop-1.exe) -SET (CPACK_CREATE_DESKTOP_LINKS "laview-desktop-1") +SET (CPACK_PACKAGE_EXECUTABLES "..\\\\win32\\\\bundle\\\\bin\\\\laview-desktop-1;LAview Desktop") +SET (CPACK_NSIS_INSTALLED_ICON_NAME ..\\\\win32\\\\bundle\\\\bin\\\\laview-desktop-1.exe) +SET (CPACK_CREATE_DESKTOP_LINKS "..\\\\win32\\\\bundle\\\\bin\\\\laview-desktop-1") INCLUDE (CPackCommonRules)