mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 12:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Using new Ghoul CMake command for shared library copying

Browse Source
This commit is contained in:
Jonas Strandstedt
2014-12-09 13:16:09 +01:00
parent e87fa3fe0f
commit 6346f4fd98
2 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/ghoul
+1 -1
Submodule ext/ghoul updated: 8418f394f4...9353bc4eba
src/CMakeLists.txt
+1 -27
View File
@@ -150,33 +150,7 @@ add_executable(OpenSpace ${SOURCE_ROOT_DIR}/main.cpp ${OPENSPACE_HEADER} ${OPENS
target_link_libraries(OpenSpace ${DEPENDENT_LIBS})
# cotire(OpenSpace)
if (WIN32)
if(GHOUL_USE_DEVIL)
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)
endif(GHOUL_USE_DEVIL)
if(GHOUL_USE_FREEIMAGE)
if (CMAKE_CL_64)
set(OPENSPACE_DLL_LIBS ${OPENSPACE_DLL_LIBS} ${GHOUL_ROOT_DIR}/ext/freeimage/lib/win64/FreeImage.dll)
else (CMAKE_CL_64)
set(OPENSPACE_DLL_LIBS ${OPENSPACE_DLL_LIBS} ${GHOUL_ROOT_DIR}/ext/freeimage/lib/win32/FreeImage.dll)
endif (CMAKE_CL_64)
endif(GHOUL_USE_FREEIMAGE)
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)
GhoulCopySharedLibraries(OpenSpace)
add_subdirectory(tests)