From 87bcb8bb1c6d98723c443a98030f160ab5a0bd0c Mon Sep 17 00:00:00 2001 From: cielavenir Date: Wed, 20 Nov 2019 13:05:00 +0900 Subject: [PATCH] add root CMakeLists --- CMakeLists.txt | 11 +++++++++++ python/CMakeLists.txt | 2 +- src/CMakeLists.txt | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000000..8131c16983 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,11 @@ +add_subdirectory(src) + +if( NOT WIN32 AND OPENRAVE_BIN_SUFFIX ) + set(OPENRAVEPY_VER_NAME "_openravepy_${OPENRAVE_VERSION_MAJOR}_${OPENRAVE_VERSION_MINOR}") +else() + set(OPENRAVEPY_VER_NAME "_openravepy_") +endif() +set(OPENRAVEPY_VER_INSTALL_DIR "${OPENRAVEPY_INSTALL_DIR}/${OPENRAVEPY_VER_NAME}") # used by openrave-config.cmake + +add_subdirectory(python) + diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 1b9cc7f16f..704db43a22 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(bindings) +#add_subdirectory(bindings) set(HAVE_ALL_PYTHON_HEADERS ${HAVE_ALL_PYTHON_HEADERS} PARENT_SCOPE) if( OPT_BUILD_PACKAGE_DEFAULT ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6909bee0df..1f5d908642 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,14 +40,14 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") # include search path include_directories( /usr/local /usr/local/include - ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/3rdparty + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty ) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") set(CMAKE_PREFIX_PATH "${MY_INSTALL_CMAKE_DIR}") # required packages -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../modules-cmake") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../modules-cmake") find_package(PkgConfig REQUIRED) find_package(LibXml2 REQUIRED) # message(STATUS "LIBXML2_INCLUDE_DIR = ${LIBXML2_INCLUDE_DIR}")