Avoid including fallback from a subdirectory

libsemigroups · Jun 11, 2018 · 2fab32b · 2fab32b
1 parent c1ed070
commit 2fab32b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,8 +53,7 @@ add_subdirectory(examples)
 add_subdirectory(benchmark)
 add_subdirectory(doc)
 
-
-include_directories(include ${PROJECT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/fallback ${PROJECT_BINARY_DIR})
 
 
 #########

diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -13,7 +13,9 @@
 #                  http://www.gnu.org/licenses/                               #
 #****************************************************************************#
 
-include_directories(${CMAKE_SOURCE_DIR}/include ${PROJECT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/fallback ${PROJECT_BINARY_DIR})
+
+include_directories(blabla)
 
 set(benchmark_src cycle.cpp inverse.cpp length.cpp sort.cpp sum.cpp)
 

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -23,7 +23,7 @@ if (NOT HPCOMBI_HAVE_DENSEHASHSET)
   message(STATUS "Google 'dense_hash_set' not found, using std::unordered_set")
 endif()
 
-include_directories(${CMAKE_SOURCE_DIR}/include ${PROJECT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/fallback ${PROJECT_BINARY_DIR})
 
 set(usage_examples RD.cpp Renner.cpp stringmonoid.cpp Trans.cpp CF.cpp)
 

diff --git a/include/perm16.hpp b/include/perm16.hpp
@@ -28,7 +28,7 @@
 #endif
 
 #if __cplusplus <= 201103L
-#include "fallback/seq.hpp"
+#include "seq.hpp"
 #endif
 
 #ifdef HPCOMBI_CONSTEXPR_FUN_ARGS

diff --git a/include/perm16_impl.hpp b/include/perm16_impl.hpp
@@ -21,7 +21,7 @@
 #ifdef HAVE_EXPERIMENTAL_NUMERIC_LCM
 #include <experimental/numeric>  // lcm until c++17
 #else
-#include "fallback/gcdlcm.hpp"  // lcm until c++17
+#include "gcdlcm.hpp"  // lcm until c++17
 #endif  // HAVE_EXPERIMENTAL_NUMERIC_LCM
 
 namespace HPCombi {

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -54,7 +54,7 @@ endforeach()
 
 set(AUTOGENERATED_WARNING "WARNING: THIS IS A CMAKE AUTO-GENERATED FILE.")
 
-include_directories(${CMAKE_SOURCE_DIR}/include ${PROJECT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/fallback ${PROJECT_BINARY_DIR})
 add_library(testtools SHARED testtools.cpp)
 
 # set_target_properties(testtools PROPERTIES PUBLIC_HEADER

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -19,7 +19,7 @@ message(STATUS "Building tests")
 find_package (Boost COMPONENTS unit_test_framework REQUIRED)
 
 include_directories ( ${Boost_INCLUDE_DIRS} )
-include_directories(${CMAKE_SOURCE_DIR}/include ${PROJECT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/fallback ${PROJECT_BINARY_DIR})
 
 add_definitions (-DBOOST_TEST_DYN_LINK)