@@ -14,6 +14,7 include_directories("${INCLUDES_DIR}") | |||
|
14 | 14 | # Find Qt modules |
|
15 | 15 | # |
|
16 | 16 | SCIQLOP_FIND_QT(Core Widgets) |
|
17 | ||
|
17 | 18 | |
|
18 | 19 | # |
|
19 | 20 | # Find dependent libraries |
@@ -68,6 +69,10 target_link_libraries(${EXECUTABLE_NAME} | |||
|
68 | 69 | |
|
69 | 70 | # Link with Qt5 modules |
|
70 | 71 | qt5_use_modules(${EXECUTABLE_NAME} Core Widgets) |
|
72 | ||
|
73 | ||
|
74 | add_dependencies(${EXECUTABLE_NAME} ${SQPGUI_LIBRARY_NAME} ${SQPCORE_LIBRARY_NAME}) | |
|
75 | ||
|
71 | 76 | |
|
72 | 77 | |
|
73 | 78 | # Add the files to the list of files to be analyzed |
@@ -42,7 +42,6 SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Setu | |||
|
42 | 42 | SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_NAME}) |
|
43 | 43 | |
|
44 | 44 | set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) |
|
45 | message("exepath" ${CPACK_PACKAGE_INSTALL_DIRECTORY}) | |
|
46 | 45 | |
|
47 | 46 | if (WIN32) |
|
48 | 47 | SET(CPACK_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) |
@@ -67,6 +67,9 set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) | |||
|
67 | 67 | TARGET_LINK_LIBRARIES(${SQPGUI_LIBRARY_NAME} ${LIBRARIES}) |
|
68 | 68 | qt5_use_modules(${SQPGUI_LIBRARY_NAME} Core Widgets PrintSupport) |
|
69 | 69 | |
|
70 | add_dependencies(${SQPGUI_LIBRARY_NAME} ${SQPCORE_LIBRARY_NAME}) | |
|
71 | ||
|
72 | ||
|
70 | 73 | # From cmake documentation: http://www.cmake.org/cmake/help/v3.0/manual/cmake-buildsystem.7.html |
|
71 | 74 | # Entries in the COMPILE_DEFINITIONS are prefixed with -D or /D and added to the compile line in an unspecified order. |
|
72 | 75 | # The DEFINE_SYMBOL target property is also added as a compile definition as a special convenience case for SHARED and MODULE library targets |
General Comments 0
You need to be logged in to leave comments.
Login now