Merge pull request #975 from SofaDefrost/fix_SofaExporter_includes

[SofaExporter] FIX: out-of-tree include of SofaExporter header files
sofa-framework · Apr 27, 2019 · dac8de9 · dac8de9
2 parents 2ee048a + b254ccc
commit dac8de9
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 11 deletions.
diff --git a/applications/plugins/CImgPlugin/CImgPluginConfig.cmake.in b/applications/plugins/CImgPlugin/CImgPluginConfig.cmake.in
@@ -9,8 +9,5 @@ if(NOT TARGET CImgPlugin)
     include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
 endif()
 
-set(@PROJECT_NAME@_INCLUDE_DIRS  @CMAKE_CURRENT_SOURCE_DIR@/../
-                                 @CImg_INCLUDE_DIRS@)
-
 check_required_components(@PROJECT_NAME@)
 find_package(CImg REQUIRED)
diff --git a/applications/plugins/CImgPlugin/CImgPlugin_test/CMakeLists.txt b/applications/plugins/CImgPlugin/CImgPlugin_test/CMakeLists.txt
@@ -12,6 +12,5 @@ add_definitions("-DCIMGPLUGIN_RESOURCES_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/images
 add_executable(${PROJECT_NAME} ${SOURCE_FILES})
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})
 target_link_libraries(${PROJECT_NAME} CImgPlugin SofaCore SofaGTestMain)
-target_include_directories(${PROJECT_NAME} PRIVATE ${CImgPlugin_INCLUDE_DIRS})
 
 
diff --git a/applications/plugins/CImgPlugin/CMakeLists.txt b/applications/plugins/CImgPlugin/CMakeLists.txt
@@ -97,9 +97,9 @@ add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES})
 target_compile_options(${PROJECT_NAME} PUBLIC ${CIMG_CFLAGS})
 target_compile_options(${PROJECT_NAME} PRIVATE "-DSOFA_BUILD_CIMGPLUGIN")
 target_link_libraries(${PROJECT_NAME} SofaCore ${EXTERNAL_LIBS})
-target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>/include")
-target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
+target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/..")
 target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CImg_INCLUDE_DIRS}>")
+target_include_directories(${PROJECT_NAME} PUBLIC "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
 
 ## Install rules for the library; CMake package configurations files
 sofa_generate_package(NAME ${PROJECT_NAME} VERSION ${${PROJECT_NAME}_VERSION} TARGETS ${PROJECT_NAME} INCLUDE_INSTALL_DIR ${PROJECT_NAME})

diff --git a/applications/plugins/CImgPlugin/ImageCImg.h b/applications/plugins/CImgPlugin/ImageCImg.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include <sofa/helper/io/Image.h>
-#include <CImgPlugin.h>
+#include "CImgPlugin.h"
 
 namespace sofa
 {

diff --git a/applications/plugins/CImgPlugin/initCImgPlugin.cpp b/applications/plugins/CImgPlugin/initCImgPlugin.cpp
@@ -1,6 +1,6 @@
 #include "CImgPlugin.h"
 
-#include <ImageCImg.h>
+#include "ImageCImg.h"
 
 #include <sofa/helper/Factory.h>
 #include <sofa/helper/io/Image.h>

diff --git a/applications/plugins/image/CMakeLists.txt b/applications/plugins/image/CMakeLists.txt
@@ -148,7 +148,6 @@ endif()
 
 target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>")
 target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>")
-target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CImgPlugin_INCLUDE_DIRS}>")
 target_include_directories(${PROJECT_NAME} PUBLIC "$<INSTALL_INTERFACE:include>")
 if(FREENECT_FOUND)
     target_include_directories(${PROJECT_NAME} PUBLIC "${FREENECT_INCLUDE_DIR}")

diff --git a/applications/plugins/image/extlibs/DiffusionSolver/CMakeLists.txt b/applications/plugins/image/extlibs/DiffusionSolver/CMakeLists.txt
@@ -29,7 +29,6 @@ if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RELEASE) # no ne
 endif()
 
 target_link_libraries(${PROJECT_NAME} CImgPlugin)
-target_include_directories(${PROJECT_NAME} PRIVATE ${CImgPlugin_INCLUDE_DIRS})
 target_include_directories(${PROJECT_NAME} PUBLIC "$<INSTALL_INTERFACE:include>")
 
 install(TARGETS ${PROJECT_NAME}

diff --git a/modules/SofaExporter/CMakeLists.txt b/modules/SofaExporter/CMakeLists.txt
@@ -48,5 +48,6 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE COMPILE_FLAGS "-DSOFA_BUILD_E
 target_compile_definitions(${PROJECT_NAME} PUBLIC COMPILE_FLAGS "-DSOFA_HAVE_SOFAEXPORTER")
 
 target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>")
+target_include_directories(${PROJECT_NAME} PUBLIC "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
 
-sofa_create_package(SofaExporter ${PROJECT_VERSION} ${PROJECT_NAME} ${PROJECT_NAME})
+sofa_generate_package(NAME SofaExporter VERSION ${PROJECT_VERSION} TARGETS ${PROJECT_NAME} INCLUDE_INSTALL_DIR ${PROJECT_NAME} INCLUDE_SOURCE_DIR "src/SofaExporter")