Set include directories for tools and core per target and not globally
This commit is contained in:
@@ -1,10 +1,5 @@
|
||||
include (VCICommon)
|
||||
|
||||
include_directories (
|
||||
../..
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
set ( headers
|
||||
Geometry/Config.hh
|
||||
Geometry/EigenVectorT.hh
|
||||
@@ -145,13 +140,31 @@ if (WIN32)
|
||||
if ( OPENMESH_BUILD_SHARED )
|
||||
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
|
||||
vci_add_library (OpenMeshCore SHARED ${sources} ${headers})
|
||||
|
||||
target_include_directories(OpenMeshCore PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
|
||||
$<INSTALL_INTERFACE:include>)
|
||||
|
||||
else()
|
||||
# OpenMesh has no dll exports so we have to build a static library on windows
|
||||
vci_add_library (OpenMeshCore STATIC ${sources} ${headers})
|
||||
|
||||
target_include_directories(OpenMeshCoreStatic PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
|
||||
$<INSTALL_INTERFACE:include>)
|
||||
endif()
|
||||
|
||||
else ()
|
||||
vci_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers})
|
||||
|
||||
target_include_directories(OpenMeshCore PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
|
||||
$<INSTALL_INTERFACE:include>)
|
||||
|
||||
target_include_directories(OpenMeshCoreStatic PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
|
||||
$<INSTALL_INTERFACE:include>)
|
||||
|
||||
set_target_properties (OpenMeshCore PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
|
||||
SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
|
||||
endif ()
|
||||
|
||||
Reference in New Issue
Block a user