Made it easier to get started on Windows

This commit is contained in:
jonasstrandstedt
2014-09-23 13:39:39 +02:00
parent dd629db53d
commit 43610798f6
2 changed files with 24 additions and 1 deletions

View File

@@ -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})

View File

@@ -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
$<TARGET_FILE_DIR:OpenSpace>)
endforeach( file_i )
endif(WIN32)
add_subdirectory(tests)