Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SofaExporter] FIX: out-of-tree include of SofaExporter header files #975

Merged
merged 12 commits into from
Apr 27, 2019
Merged

[SofaExporter] FIX: out-of-tree include of SofaExporter header files #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2150bb7
[SofaExporter] FIX: out-of-tree include of SofaExporter header files
marques-bruno Mar 29, 2019
91633dd
Merge branch 'master' into fix_SofaExporter_includes
marques-bruno Apr 4, 2019
d75b237
[CImgPlugin][SofaExporter] FIX: include export in targets
marques-bruno Apr 4, 2019
c008496
[CImgPlugin_test] RESTORING erased CMakeLists.txt...
marques-bruno Apr 4, 2019
fc19fec
FIX: INCLUDE_SOURCE_DIR in CImgPlugin
marques-bruno Apr 10, 2019
c93eca4
[CImgPlugin] REMOVE ../ from include dirs
marques-bruno Apr 17, 2019
205a024
[CImgPlugin] Reverting last commit
marques-bruno Apr 24, 2019
962dc8b
Removing deprecated CImg includes dirs
marques-bruno Apr 26, 2019
47e0e96
[CImgPlugin] CLEAN include directories for build interface
guparan Apr 26, 2019
3ca2ff3
[CImgPlugin] FIX wrong include relative paths
guparan Apr 26, 2019
b7eccba
[CImgPlugin] setting ImageCImg.h from system to local include
marques-bruno Apr 26, 2019
b254ccc
Merge branch 'fix_SofaExporter_includes' of github.com:SofaDefrost/so…
marques-bruno Apr 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions applications/plugins/CImgPlugin/CImgPluginConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
1 change: 0 additions & 1 deletion applications/plugins/CImgPlugin/CImgPlugin_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})


4 changes: 2 additions & 2 deletions applications/plugins/CImgPlugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/CImgPlugin/ImageCImg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <string>
#include <vector>
#include <sofa/helper/io/Image.h>
#include <CImgPlugin.h>
#include "CImgPlugin.h"

namespace sofa
{
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/CImgPlugin/initCImgPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "CImgPlugin.h"

#include <ImageCImg.h>
#include "ImageCImg.h"

#include <sofa/helper/Factory.h>
#include <sofa/helper/io/Image.h>
Expand Down
1 change: 0 additions & 1 deletion applications/plugins/image/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
1 change: 0 additions & 1 deletion applications/plugins/image/extlibs/DiffusionSolver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 2 additions & 1 deletion modules/SofaExporter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")