Skip to content

Commit eab7eed

Browse files
committed
cmake: Apply change to be compatible with workspace
1 parent 615b427 commit eab7eed

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ set(PROJECT_USE_CMAKE_EXPORT TRUE)
1111
set(PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE)
1212
set(PROJECT_CUSTOM_HEADER_EXTENSION "hpp")
1313
set(PROJECT_COMPATIBILITY_VERSION AnyNewerVersion)
14+
set(PROJECT_AUTO_RUN_FINALIZE FALSE)
1415

1516
# Check if the submodule cmake have been initialized
1617
set(JRL_CMAKE_MODULES "${CMAKE_CURRENT_LIST_DIR}/cmake")
@@ -344,10 +345,12 @@ set(${PROJECT_NAME}_SOURCES
344345

345346
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES}
346347
${${PROJECT_NAME}_HEADERS})
348+
add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
347349
set_standard_output_directory(${PROJECT_NAME})
348350
target_include_directories(
349351
${PROJECT_NAME} SYSTEM
350352
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
353+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
351354
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
352355

353356
modernize_target_link_libraries(
@@ -450,3 +453,5 @@ pkg_config_append_libs(${PROJECT_NAME})
450453
pkg_config_append_cflags("-I${PYTHON_INCLUDE_DIRS}")
451454
pkg_config_append_cflags("-I${NUMPY_INCLUDE_DIRS}")
452455
pkg_config_append_boost_libs(${BOOST_COMPONENTS})
456+
457+
setup_project_finalize()

doc/Doxyfile.extra.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
INPUT = @CMAKE_SOURCE_DIR@/src \
2-
@CMAKE_SOURCE_DIR@/doc/additionalDoc
3-
IMAGE_PATH = @CMAKE_SOURCE_DIR@/doc/pictures
1+
INPUT = @PROJECT_SOURCE_DIR@/src \
2+
@PROJECT_SOURCE_DIR@/doc/additionalDoc
3+
IMAGE_PATH = @PROJECT_SOURCE_DIR@/doc/pictures
44

55
FILE_PATTERNS = *.cc *.cpp *.h *.hpp *.hxx
66

python/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ make_directory("${${PROJECT_NAME}_BINARY_DIR}/python/${PROJECT_NAME}")
1212
include(${JRL_CMAKE_MODULES}/python-helpers.cmake)
1313
include("${JRL_CMAKE_MODULES}/stubs.cmake")
1414

15-
add_custom_target(python)
16-
set_target_properties(python PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD True)
15+
add_custom_target(${PROJECT_NAME}_python)
16+
set_target_properties(${PROJECT_NAME}_python PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD True)
1717

1818
add_library(${PYWRAP} MODULE main.cpp)
19-
add_dependencies(python ${PYWRAP})
19+
add_dependencies(${PROJECT_NAME}_python ${PYWRAP})
2020
target_link_libraries(${PYWRAP} PUBLIC ${PROJECT_NAME})
2121

2222
python_build_get_target(python_build_target)
@@ -40,13 +40,13 @@ set_target_properties(
4040
PROPERTIES PREFIX ""
4141
SUFFIX ${PYTHON_EXT_SUFFIX}
4242
LIBRARY_OUTPUT_DIRECTORY
43-
"${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}"
43+
"${PROJECT_BINARY_DIR}/python/${PROJECT_NAME}"
4444
LIBRARY_OUTPUT_DIRECTORY_<CONFIG>
45-
"${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}"
45+
"${PROJECT_BINARY_DIR}/python/${PROJECT_NAME}"
4646
RUNTIME_OUTPUT_DIRECTORY
47-
"${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}"
47+
"${PROJECT_BINARY_DIR}/python/${PROJECT_NAME}"
4848
RUNTIME_OUTPUT_DIRECTORY_<CONFIG>
49-
"${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}")
49+
"${PROJECT_BINARY_DIR}/python/${PROJECT_NAME}")
5050

5151
if(UNIX)
5252
get_relative_rpath(${${PYWRAP}_INSTALL_DIR} ${PYWRAP}_INSTALL_RPATH)

0 commit comments

Comments
 (0)