diff --git a/CMakeLists.txt b/CMakeLists.txt index fa9e1e7b1e1e8bdf2fa169aa4276f5865fe69589..7d2af5a669ce0e2829b3413b04a89141dfc8bc24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ set(PROJECT_USE_CMAKE_EXPORT TRUE) set(PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE) set(PROJECT_CUSTOM_HEADER_EXTENSION "hpp") set(PROJECT_COMPATIBILITY_VERSION AnyNewerVersion) +set(PROJECT_AUTO_RUN_FINALIZE FALSE) # Check if the submodule cmake have been initialized set(JRL_CMAKE_MODULES "${CMAKE_CURRENT_LIST_DIR}/cmake") @@ -344,10 +345,12 @@ set(${PROJECT_NAME}_SOURCES add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS}) +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) set_standard_output_directory(${PROJECT_NAME}) target_include_directories( ${PROJECT_NAME} SYSTEM PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) modernize_target_link_libraries( @@ -450,3 +453,5 @@ pkg_config_append_libs(${PROJECT_NAME}) pkg_config_append_cflags("-I${PYTHON_INCLUDE_DIRS}") pkg_config_append_cflags("-I${NUMPY_INCLUDE_DIRS}") pkg_config_append_boost_libs(${BOOST_COMPONENTS}) + +setup_project_finalize() diff --git a/doc/Doxyfile.extra.in b/doc/Doxyfile.extra.in index 733ef2e24209ec5b24b9b6d59a4de4106805ccbf..d3290a4f13ce4c1eb0aefa1e3b0f01eeb8685559 100644 --- a/doc/Doxyfile.extra.in +++ b/doc/Doxyfile.extra.in @@ -1,6 +1,6 @@ -INPUT = @CMAKE_SOURCE_DIR@/src \ - @CMAKE_SOURCE_DIR@/doc/additionalDoc -IMAGE_PATH = @CMAKE_SOURCE_DIR@/doc/pictures +INPUT = @PROJECT_SOURCE_DIR@/src \ + @PROJECT_SOURCE_DIR@/doc/additionalDoc +IMAGE_PATH = @PROJECT_SOURCE_DIR@/doc/pictures FILE_PATTERNS = *.cc *.cpp *.h *.hpp *.hxx diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 4781e42f35a6d08e6b0e0f00960c61a162ed42b5..44719c1a0958e42bac0f0867ed829414692c0c4a 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -12,11 +12,11 @@ make_directory("${${PROJECT_NAME}_BINARY_DIR}/python/${PROJECT_NAME}") include(${JRL_CMAKE_MODULES}/python-helpers.cmake) include("${JRL_CMAKE_MODULES}/stubs.cmake") -add_custom_target(python) -set_target_properties(python PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD True) +add_custom_target(${PROJECT_NAME}_python) +set_target_properties(${PROJECT_NAME}_python PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD True) add_library(${PYWRAP} MODULE main.cpp) -add_dependencies(python ${PYWRAP}) +add_dependencies(${PROJECT_NAME}_python ${PYWRAP}) target_link_libraries(${PYWRAP} PUBLIC ${PROJECT_NAME}) python_build_get_target(python_build_target) @@ -40,13 +40,13 @@ set_target_properties( PROPERTIES PREFIX "" SUFFIX ${PYTHON_EXT_SUFFIX} LIBRARY_OUTPUT_DIRECTORY - "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}" + "${PROJECT_BINARY_DIR}/python/${PROJECT_NAME}" LIBRARY_OUTPUT_DIRECTORY_<CONFIG> - "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}" + "${PROJECT_BINARY_DIR}/python/${PROJECT_NAME}" RUNTIME_OUTPUT_DIRECTORY - "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}" + "${PROJECT_BINARY_DIR}/python/${PROJECT_NAME}" RUNTIME_OUTPUT_DIRECTORY_<CONFIG> - "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}") + "${PROJECT_BINARY_DIR}/python/${PROJECT_NAME}") if(UNIX) get_relative_rpath(${${PYWRAP}_INSTALL_DIR} ${PYWRAP}_INSTALL_RPATH)