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

ACGCommon_update_and_use_SHAREDANDSTATIC_target_and_dont_install_headers_in_bundle

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@166 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2009-06-22 07:07:19 +00:00
parent 75a9d65dd5
commit 8bf2f88448
3 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenMesh/Core/CMakeLists.txt
View File

@@ -28,12 +28,13 @@ if (WIN32)
# OpenMesh has no dll exports so we have to build a static library on windows
acg_add_library (OpenMeshCore STATIC ${sources} ${headers})
else ()
acg_add_library (OpenMeshCore SHARED ${sources} ${headers})
acg_add_library (OpenMeshCores STATIC ${sources} ${headers})
acg_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers})
endif ()
# Install Header Files
if (NOT ACG_PROJECT_MACOS_BUNDLE OR NOT APPLE)
install(DIRECTORY .
DESTINATION include/OpenMesh/Core
FILES_MATCHING
@@ -71,5 +72,6 @@ install(DIRECTORY IO/
PATTERN "exporter" EXCLUDE
PATTERN "tmp" EXCLUDE
PATTERN "Debian*" EXCLUDE )
endif ()

7
src/OpenMesh/Tools/CMakeLists.txt
View File

@@ -28,12 +28,13 @@ if (WIN32)
# OpenMesh has no dll exports so we have to build a static library on windows
acg_add_library (OpenMeshTools STATIC ${sources} ${headers})
else ()
acg_add_library (OpenMeshTools SHARED ${sources} ${headers})
acg_add_library (OpenMeshToolss STATIC ${sources} ${headers})
acg_add_library (OpenMeshTools SHAREDANDSTATIC ${sources} ${headers})
endif ()
target_link_libraries (OpenMeshTools OpenMeshCore)
target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic)
if (NOT ACG_PROJECT_MACOS_BUNDLE OR NOT APPLE)
# Install Header Files
install(DIRECTORY .
DESTINATION include/OpenMesh/Tools
@@ -55,4 +56,4 @@ install(DIRECTORY .
PATTERN "tmp" EXCLUDE
PATTERN "Templates" EXCLUDE
PATTERN "Debian*" EXCLUDE)
endif ()