diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-10 16:39:02 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-10 16:39:02 +0000 |
| commit | d6a275cde67490784f1f7a4362c07a1132672344 (patch) | |
| tree | 82dc822e23f276daec84cc09a0fb410c31c40bfe /src/CMakeLists.txt | |
| parent | c536d49278965cd578281ecbec72cea2c8b90cc3 (diff) | |
| parent | eb0bd21b93509e8a2cb9485ac46dcba128893538 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/farthest_distance@2329 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: ba0fbf37ea8108d8c3ca21162d7cb815a92336f7
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4fa73662..0c16c9cc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,6 +13,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/") set(GUDHI_USER_VERSION_DIR ${CMAKE_SOURCE_DIR}) include(${CMAKE_MODULE_PATH}/GUDHI_doxygen_target.txt) +# This variable is used by Cython CMakeLists.txt to know its path +set(GUDHI_CYTHON_PATH "cython") # For third parties libraries management - To be done last as CGAL updates CMAKE_MODULE_PATH include("${CMAKE_MODULE_PATH}/GUDHI_third_party_libraries.txt") @@ -56,12 +58,9 @@ add_subdirectory(example/Bottleneck_distance) # data points generator add_subdirectory(data/points/generator) -# Please let GudhUI in last compilation position as QT is known to modify CMAKE_CXX_FLAGS -# GudhUI add_subdirectory(GudhUI) -# This variable is used by Cython CMakeLists.txt to know its path -set(GUDHI_CYTHON_PATH "cython") +# specific for cython module add_subdirectory(${GUDHI_CYTHON_PATH}) #--------------------------------------------------------------------------------------- |