Skip to content
Snippets Groups Projects
Unverified Commit 4719963d authored by Joris Vaillant's avatar Joris Vaillant
Browse files

cmake: Replace CMAKE_{SOURCE,BINARY}_DIR by PROJECT_{SOURCE,BINARY}_DIR

parent f2382ce9
No related branches found
No related tags found
No related merge requests found
......@@ -169,10 +169,10 @@ if(COAL_HAS_QHULL)
message(STATUS "Qhullcpp not found: it will be build from sources, if Qhull_r is found")
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/third-parties)
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_SOURCE_DIR}/third-parties/qhull/src/libqhullcpp
${CMAKE_CURRENT_BINARY_DIR}/third-parties/libqhullcpp
${PROJECT_SOURCE_DIR}/third-parties/qhull/src/libqhullcpp
${PROJECT_BINARY_DIR}/third-parties/libqhullcpp
)
set(Qhullcpp_PREFIX ${CMAKE_BINARY_DIR}/third-parties)
set(Qhullcpp_PREFIX ${PROJECT_BINARY_DIR}/third-parties)
find_path(Qhull_r_INCLUDE_DIR
NAMES libqhull_r/libqhull_r.h
PATHS ${Qhull_PREFIX}
......
......@@ -94,8 +94,8 @@ ELSE()
ENDIF()
IF(ENABLE_DOXYGEN_AUTODOC)
ADD_CUSTOM_TARGET(generate_doxygen_cpp_doc
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/doc/python/doxygen_xml_parser.py
${CMAKE_BINARY_DIR}/doc/doxygen-xml/index.xml
COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/doc/python/doxygen_xml_parser.py
${PROJECT_BINARY_DIR}/doc/doxygen-xml/index.xml
${CMAKE_CURRENT_BINARY_DIR}/doxygen_autodoc > ${CMAKE_CURRENT_BINARY_DIR}/doxygen_autodoc.log
BYPRODUCTS
${CMAKE_CURRENT_BINARY_DIR}/doxygen_autodoc/doxygen_xml_parser_for_cmake.hh
......@@ -127,7 +127,7 @@ ENDIF(COAL_HAS_OCTOMAP)
ADD_LIBRARY(${PYTHON_LIB_NAME} MODULE ${${PYTHON_LIB_NAME}_SOURCES} ${${PYTHON_LIB_NAME}_HEADERS})
TARGET_INCLUDE_DIRECTORIES(${PYTHON_LIB_NAME} SYSTEM PRIVATE ${PYTHON_INCLUDE_DIRS})
TARGET_INCLUDE_DIRECTORIES(${PYTHON_LIB_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/src" "${CMAKE_CURRENT_BINARY_DIR}")
TARGET_INCLUDE_DIRECTORIES(${PYTHON_LIB_NAME} PRIVATE "${PROJECT_SOURCE_DIR}/src" "${CMAKE_CURRENT_BINARY_DIR}")
IF(WIN32)
TARGET_LINK_LIBRARIES(${PYTHON_LIB_NAME} PUBLIC ${PYTHON_LIBRARY})
ENDIF(WIN32)
......@@ -148,10 +148,15 @@ TARGET_LINK_LIBRARIES(${PYTHON_LIB_NAME} PUBLIC
SET_TARGET_PROPERTIES(${PYTHON_LIB_NAME} PROPERTIES
PREFIX ""
SUFFIX "${PYTHON_EXT_SUFFIX}"
<<<<<<< HEAD
OUTPUT_NAME "${PYTHON_LIB_NAME}"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}"
# On Windows, shared library are treat as binary
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}"
=======
LIBRARY_OUTPUT_NAME ${LIBRARY_NAME}
LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/python/${LIBRARY_NAME}"
>>>>>>> a41725d3 (cmake: Replace CMAKE_{SOURCE,BINARY}_DIR by PROJECT_{SOURCE,BINARY}_DIR)
)
IF(IS_ABSOLUTE ${PYTHON_SITELIB})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment