From 43610798f6dff593f242d5458ca6f6f552ddf18a Mon Sep 17 00:00:00 2001 From: jonasstrandstedt Date: Tue, 23 Sep 2014 13:39:39 +0200 Subject: [PATCH] Made it easier to get started on Windows --- CMakeLists.txt | 7 ++++++- src/CMakeLists.txt | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff62ae9684..712d929af4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,7 +102,12 @@ endif(OPENCL_FOUND) # Kameleon option(KAMELEON_LIBRARY_ONLY "Build with Kameleon as library only" ON) -option(BUILD_SHARED_LIBS "Build Shared Libraries" ON) +if(WIN32) + option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF) +else(WIN32) + option(BUILD_SHARED_LIBS "Build Shared Libraries" ON) +endif(WIN32) +option(KAMELEON_USE_HDF5 "Kameleon use HDF5" OFF) set(KAMELEON_ROOT_DIR ${OPENSPACE_EXT_DIR}/kameleon) set(KAMELEON_INCLUDES ${KAMELEON_ROOT_DIR}/src) add_subdirectory(${KAMELEON_ROOT_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9099e1666d..0a2b8101ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -142,5 +142,23 @@ include_directories("${HEADER_ROOT_DIR}") add_executable(OpenSpace ${SOURCE_ROOT_DIR}/main.cpp ${OPENSPACE_HEADER} ${OPENSPACE_SOURCE}) target_link_libraries(OpenSpace ${DEPENDENT_LIBS}) +if (WIN32) + if (CMAKE_CL_64) + set(OPENSPACE_DLL_LIBS ${OPENSPACE_DLL_LIBS} ${GHOUL_ROOT_DIR}/ext/il/lib/win64/DevIL.dll) + set(OPENSPACE_DLL_LIBS ${OPENSPACE_DLL_LIBS} ${GHOUL_ROOT_DIR}/ext/il/lib/win64/ILU.dll) + set(OPENSPACE_DLL_LIBS ${OPENSPACE_DLL_LIBS} ${GHOUL_ROOT_DIR}/ext/il/lib/win64/ILUT.dll) + else (CMAKE_CL_64) + set(OPENSPACE_DLL_LIBS ${OPENSPACE_DLL_LIBS} ${GHOUL_ROOT_DIR}/ext/il/lib/win32/DevIL.dll) + set(OPENSPACE_DLL_LIBS ${OPENSPACE_DLL_LIBS} ${GHOUL_ROOT_DIR}/ext/il/lib/win32/ILU.dll) + set(OPENSPACE_DLL_LIBS ${OPENSPACE_DLL_LIBS} ${GHOUL_ROOT_DIR}/ext/il/lib/win32/ILUT.dll) + endif (CMAKE_CL_64) + foreach( file_i ${OPENSPACE_DLL_LIBS}) + add_custom_command(TARGET OpenSpace POST_BUILD # Adds a post-build event to MyTest + COMMAND ${CMAKE_COMMAND} -E copy_if_different # which executes "cmake - E copy_if_different..." + "${file_i}" # <--this is in-file + $) + endforeach( file_i ) +endif(WIN32) + add_subdirectory(tests)