mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 04:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Jenkins compile fix by specifying compile settings for applications

Browse Source
This commit is contained in:
Alexander Bock
2017-07-15 15:53:45 -04:00
parent 469140f4f0
commit 9401579cc0
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/Launcher/CMakeLists.txt
View File

@@ -29,7 +29,8 @@ if (WIN32)
set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/Launcher/openspace.rc)
endif ()
include (${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
include(${OPENSPACE_CMAKE_EXT_DIR}/support_macros.cmake)
set(application_path ${OPENSPACE_APPS_DIR}/Launcher)
@@ -65,6 +66,8 @@ add_executable(${APPLICATION_NAME} MACOSX_BUNDLE
${RESOURCE_FILES}
)
set_compile_settings(${APPLICATION_NAME})
target_link_libraries(${APPLICATION_NAME}
Qt5::Widgets
Qt5::Network

3
apps/OpenSpace/CMakeLists.txt
View File

@@ -23,6 +23,7 @@
##########################################################################################
include(${GHOUL_BASE_DIR}/support/cmake/CopySharedLibraries.cmake)
include(${OPENSPACE_CMAKE_EXT_DIR}/support_macros.cmake)
set(APPLICATION_NAME OpenSpace)
set(APPLICATION_LINK_TO_OPENSPACE ON)
@@ -130,3 +131,5 @@ if (MSVC)
"/NODEFAULTLIB:LIBCMTD.lib /NODEFAULTLIB:LIBCMT.lib"
)
endif()
set_compile_settings(${APPLICATION_NAME})

2
apps/TaskRunner/CMakeLists.txt
View File

@@ -26,6 +26,7 @@ set(APPLICATION_NAME TaskRunner)
set(APPLICATION_LINK_TO_OPENSPACE ON)
include (${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
include(${OPENSPACE_CMAKE_EXT_DIR}/support_macros.cmake)
set(application_path ${OPENSPACE_APPS_DIR}/TaskRunner)
@@ -37,3 +38,4 @@ add_executable(${APPLICATION_NAME} MACOSX_BUNDLE
${SOURCE_FILES}
)
set_compile_settings(${APPLICATION_NAME})