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

Added install target for static versions

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@170 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2009-06-23 07:12:50 +00:00
parent 4c26d43af7
commit bcdb326c6b
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cmake/ACGCommon.cmake
View File

@@ -341,7 +341,13 @@ function (acg_add_library _target _libtype)
set (_and_static 0) set (_and_static 0)
endif () endif ()
add_library (${_target} ${_type} ${ARGN}) add_library (${_target} ${_type} ${ARGN} )
# acg_get_version()
#
# set_target_properties (${_target} PROPERTIES VERSION ${VERSION-MAJOR}.${VERSION-MINOR}
# SOVERSION ${VERSION-MAJOR}.${VERSION-MINOR} )
#
# set common target properties defined in common.cmake # set common target properties defined in common.cmake
acg_set_target_props (${_target}) acg_set_target_props (${_target})
@@ -353,8 +359,17 @@ function (acg_add_library _target _libtype)
acg_set_target_props (${_target}Static) acg_set_target_props (${_target}Static)
if (NOT APPLE) if (NOT APPLE)
# todo : create correct so names
set_target_properties (${_target}Static PROPERTIES set_target_properties (${_target}Static PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
)
# todo : rename the lib to omit the static name extension
install (TARGETS ${_target}Static
RUNTIME DESTINATION ${ACG_PROJECT_BINDIR}
LIBRARY DESTINATION ${ACG_PROJECT_LIBDIR}
ARCHIVE DESTINATION ${ACG_PROJECT_LIBDIR} )
endif () endif ()
endif () endif ()
@@ -426,7 +441,7 @@ function (acg_add_library _target _libtype)
endif () endif ()
if (NOT ACG_PROJECT_MACOS_BUNDLE OR NOT APPLE) if (NOT ACG_PROJECT_MACOS_BUNDLE OR NOT APPLE)
if (${_type} STREQUAL SHARED OR ${_type} STREQUAL STATIC) if (${_type} STREQUAL SHARED OR ${_type} STREQUAL STATIC )
install (TARGETS ${_target} install (TARGETS ${_target}
RUNTIME DESTINATION ${ACG_PROJECT_BINDIR} RUNTIME DESTINATION ${ACG_PROJECT_BINDIR}
LIBRARY DESTINATION ${ACG_PROJECT_LIBDIR} LIBRARY DESTINATION ${ACG_PROJECT_LIBDIR}