Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dennis:

Browse Source 
Updated cmake


git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@149 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2009-06-04 14:41:31 +00:00
parent 9c5e79809b
commit 8189983b32
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cmake/ACGCommon.cmake
View File

@@ -57,11 +57,11 @@ endmacro ()
# set directory structures for the different platforms # set directory structures for the different platforms
if (WIN32) if (WIN32)
set (ACG_PROJECT_DATADIR ".") set (ACG_PROJECT_DATADIR ".")
set (ACG_PROJECT_LIBDIR "bin") set (ACG_PROJECT_LIBDIR "lib")
set (ACG_PROJECT_BINDIR "bin") set (ACG_PROJECT_BINDIR ".")
set (ACG_PROJECT_PLUGINDIR "Plugins") set (ACG_PROJECT_PLUGINDIR "Plugins")
if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}) if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR})
file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}) file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR})
endif () endif ()
else () else ()
set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}") set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}")
@@ -342,7 +342,7 @@ function (acg_add_library _target _type)
COMMAND ${CMAKE_COMMAND} -E COMMAND ${CMAKE_COMMAND} -E
copy_if_different copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}.dll ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}.dll
${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/${_target}.dll) ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}/${_target}.dll)
elseif (${_type} STREQUAL MODULE) elseif (${_type} STREQUAL MODULE)
if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR}) if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR})
file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR}) file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR})
@@ -353,6 +353,13 @@ function (acg_add_library _target _type)
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}.dll ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}.dll
${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR}/${_target}.dll) ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR}/${_target}.dll)
endif () endif ()
if (${_type} STREQUAL SHARED OR ${_type} STREQUAL STATIC)
add_custom_command (TARGET ${_target} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}.lib
${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/${_target}.lib)
endif ()
elseif (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE) elseif (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE)
if (${_type} STREQUAL SHARED) if (${_type} STREQUAL SHARED)
add_custom_command (TARGET ${_target} POST_BUILD add_custom_command (TARGET ${_target} POST_BUILD
@@ -372,8 +379,11 @@ function (acg_add_library _target _type)
endif () endif ()
endif () endif ()
if (NOT ACG_PROJECT_BUNDLE OR NOT APPLE) if (NOT ACG_PROJECT_BUNDLE OR NOT APPLE)
if (${_type} STREQUAL SHARED) if (${_type} STREQUAL SHARED OR ${_type} STREQUAL STATIC)
install (TARGETS ${_target} DESTINATION ${ACG_PROJECT_LIBDIR}) install (TARGETS ${_target}
RUNTIME DESTINATION ${ACG_PROJECT_BINDIR}
LIBRARY DESTINATION ${ACG_PROJECT_LIBDIR}
ARCHIVE DESTINATION ${ACG_PROJECT_LIBDIR})
elseif (${_type} STREQUAL MODULE) elseif (${_type} STREQUAL MODULE)
install (TARGETS ${_target} DESTINATION ${ACG_PROJECT_PLUGINDIR}) install (TARGETS ${_target} DESTINATION ${ACG_PROJECT_PLUGINDIR})
endif () endif ()