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

Don't install includes when build inside OpenFlipper

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@368 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2011-01-28 10:12:31 +00:00
parent d12c25d365
commit 6c58af39e2
2 changed files with 113 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,11 +35,8 @@ else ()
endif () endif ()
# Install Header Files # Install Header Files (Apple)
if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE )
if (NOT ACG_PROJECT_MACOS_BUNDLE OR NOT APPLE)
if ( APPLE )
FILE(GLOB files_install_Geometry "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*T.cc" ) FILE(GLOB files_install_Geometry "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*T.cc" )
FILE(GLOB files_install_IO "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/*T.cc" "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.inl" ) FILE(GLOB files_install_IO "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/*T.cc" "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.inl" )
FILE(GLOB files_install_IO_importer "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*T.cc" ) FILE(GLOB files_install_IO_importer "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*T.cc" )
@@ -60,10 +57,13 @@ if ( APPLE )
INSTALL(FILES ${files_install_Mesh_Gen} DESTINATION include/OpenMesh/Core/Mesh/gen ) INSTALL(FILES ${files_install_Mesh_Gen} DESTINATION include/OpenMesh/Core/Mesh/gen )
INSTALL(FILES ${files_install_System} DESTINATION include/OpenMesh/Core/System ) INSTALL(FILES ${files_install_System} DESTINATION include/OpenMesh/Core/System )
INSTALL(FILES ${files_install_Utils} DESTINATION include/OpenMesh/Core/Utils ) INSTALL(FILES ${files_install_Utils} DESTINATION include/OpenMesh/Core/Utils )
endif(APPLE) endif()
# Only install if the project name matches OpenMesh.
if (NOT APPLE AND ${PROJECT_NAME} MATCHES "OpenMesh")
# Install Header Files)
install(DIRECTORY . install(DIRECTORY .
DESTINATION include/OpenMesh/Core DESTINATION include/OpenMesh/Core
FILES_MATCHING FILES_MATCHING
@@ -101,6 +101,7 @@ install(DIRECTORY IO/
PATTERN "exporter" EXCLUDE PATTERN "exporter" EXCLUDE
PATTERN "tmp" EXCLUDE PATTERN "tmp" EXCLUDE
PATTERN "Debian*" EXCLUDE ) PATTERN "Debian*" EXCLUDE )
endif () endif ()

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

@@ -41,9 +41,8 @@ IF( NOT WIN32 )
target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic) target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic)
ENDIF(NOT WIN32) ENDIF(NOT WIN32)
if (NOT ACG_PROJECT_MACOS_BUNDLE OR NOT APPLE) # Install Header Files (Apple)
if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE )
if ( APPLE )
FILE(GLOB files_install_Decimater "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*T.cc" ) FILE(GLOB files_install_Decimater "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*T.cc" )
FILE(GLOB files_install_Dualizer "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*T.cc" ) FILE(GLOB files_install_Dualizer "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*T.cc" )
FILE(GLOB files_install_KERNEL_OSG "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*T.cc" ) FILE(GLOB files_install_KERNEL_OSG "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*T.cc" )
@@ -62,9 +61,12 @@ if ( APPLE )
INSTALL(FILES ${files_install_Subdivider_Uniform_Composite} DESTINATION include/OpenMesh/Tools/Subdivider/Uniform/Composite ) INSTALL(FILES ${files_install_Subdivider_Uniform_Composite} DESTINATION include/OpenMesh/Tools/Subdivider/Uniform/Composite )
INSTALL(FILES ${files_install_Utils} DESTINATION include/OpenMesh/Tools/Utils ) INSTALL(FILES ${files_install_Utils} DESTINATION include/OpenMesh/Tools/Utils )
INSTALL(FILES ${files_install_VDPM} DESTINATION include/OpenMesh/Tools/VDPM ) INSTALL(FILES ${files_install_VDPM} DESTINATION include/OpenMesh/Tools/VDPM )
endif( APPLE ) endif()
# Only install if the project name matches OpenMesh.
if (NOT APPLE AND ${PROJECT_NAME} MATCHES "OpenMesh")
# Install Header Files # Install Header Files
install(DIRECTORY . install(DIRECTORY .
DESTINATION include/OpenMesh/Tools DESTINATION include/OpenMesh/Tools