summaryrefslogtreecommitdiffhomepage
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-07-12 07:24:52 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-07-12 07:24:52 +0200
commit1ac0f1ade4242ae39293f19c8dcb84847970732d (patch)
tree04092b4e5b7352b1467298c6ef507b33fdb1ec27 /CMakeLists.txt
parent8b4061609304743e4082e02f8c91e5ba0fd3c2a3 (diff)
Fix DLL hell; reindent
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt20
1 files changed, 12 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef231b06..75edab97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,7 +439,7 @@ endif()
PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/facetracknoir/posix-version-script.txt")
endif()
- if(SDK_RIFT)
+ if(SDK_RIFT)
include_directories("${SDK_RIFT}/include")
include_directories("${SDK_RIFT}/Src")
add_library(opentrack-tracker-rift SHARED ${opentrack-tracker-rift-c} ${opentrack-tracker-rift-moc} ${opentrack-tracker-rift-uih} ${opentrack-tracker-rift-rcc})
@@ -453,19 +453,23 @@ endif()
endif()
endif()
- if(SDK_HYDRA)
- include_directories("${SDK_HYDRA}/include")
- include_directories("${SDK_HYDRA}/include/sixense_utils")
+ if(SDK_HYDRA)
+ include_directories("${SDK_HYDRA}/include")
+ include_directories("${SDK_HYDRA}/include/sixense_utils")
add_library(opentrack-tracker-hydra SHARED ${opentrack-tracker-hydra-c} ${opentrack-tracker-hydra-moc} ${opentrack-tracker-hydra-uih} ${opentrack-tracker-hydra-rcc})
target_link_libraries(opentrack-tracker-hydra ${MY_QT_LIBS})
- if(WIN32)
- target_link_libraries(opentrack-tracker-hydra "${SDK_HYDRA}/lib/win32/release_static/sixense_s.lib" "${SDK_HYDRA}/lib/win32/release_static/sixense_utils_s.lib")
- endif()
+ if(WIN32)
+ target_link_libraries(opentrack-tracker-hydra "${SDK_HYDRA}/lib/win32/release_static/sixense_s.lib" "${SDK_HYDRA}/lib/win32/release_static/sixense_utils_s.lib")
+ endif()
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
SET_TARGET_PROPERTIES(opentrack-tracker-hydra
PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/facetracknoir/posix-version-script.txt")
+ else()
+ if(MSVC)
+ SET_TARGET_PROPERTIES(opentrack-tracker-hydra PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt.lib")
+ endif()
endif()
- endif()
+ endif()
if(WIN32 AND NOT SDK_CONSOLE_DEBUG)
set(opentrack-win32-executable WIN32)