Simplify CMake scripts

Delete FindTurf.cmake as it was more complicated than necessary.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be8526d4b46b6ce23dea5cafe20b7d6792d78b05..93cf495de51c5b16630515332694455c1a4bb503 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,8 @@ set(JUNCTION_ALL_DLLS "")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
 # Add turf targets and import its macros since we use them below
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
 # Add turf targets and import its macros since we use them below

-find_package(Turf REQUIRED)
+get_filename_component(outerPath "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
+set(TURF_ROOT "${outerPath}/turf" CACHE STRING "Path to Turf")

 include("${TURF_ROOT}/cmake/Macros.cmake")
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     # If this is the root project, apply build settings here so that
 include("${TURF_ROOT}/cmake/Macros.cmake")
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     # If this is the root project, apply build settings here so that

diff --git a/cmake/modules/FindTurf.cmake b/cmake/modules/FindTurf.cmake
deleted file mode 100644 (file)
index d9a684a..0000000
--- a/cmake/modules/FindTurf.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-#----------------------------------------------
-# This find module locates the Turf *source*.
-#
-# Later, it might find binary packages too.
-#
-# Sets:
-#    TURF_FOUND
-#    TURF_ROOT - the root folder, containing CMakeLists.txt
-#    TURF_INCLUDE_DIRS - pass to include_directories()
-#----------------------------------------------
-
-if(TURF_ROOT)
-    get_filename_component(fullPath "${TURF_ROOT}" ABSOLUTE)
-    if(EXISTS "${fullPath}/cmake/turf_config.h.in")
-        set(TURF_FOUND TRUE)
-    endif()
-else()
-    find_path(TURF_ROOT "cmake/turf_config.h.in" PATHS
-        "${CMAKE_CURRENT_SOURCE_DIR}/../turf"
-        "${CMAKE_SOURCE_DIR}/../turf"
-        "${CMAKE_CURRENT_LIST_DIR}/../../../turf")
-    if(TURF_ROOT)
-        set(TURF_FOUND TRUE)
-    endif()
-endif()
-
-if(NOT TURF_FOUND)
-    message("Can't find Turf!")
-    if(Turf_FIND_REQUIRED)
-        message(FATAL_ERROR "Missing required package Turf")
-    endif()
-endif()

diff --git a/samples/AddSample.cmake b/samples/AddSample.cmake
index 1083977de76232d9e33b3b6917b85f795964644a..7a11c3aa7b003842b462cf32bc10732683e24263 100644 (file)
--- a/samples/AddSample.cmake
+++ b/samples/AddSample.cmake
@@ -5,8 +5,8 @@
 # Were we included from the root listfile?
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     # Yes, it's the root.
 # Were we included from the root listfile?
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     # Yes, it's the root.

-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake/modules")
-    find_package(Turf REQUIRED)
+    get_filename_component(outerPath "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
+    set(TURF_ROOT "${outerPath}/turf" CACHE STRING "Path to Turf")

     include("${TURF_ROOT}/cmake/Macros.cmake")
     ApplyTurfBuildSettings()
     add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/.." junction)
     include("${TURF_ROOT}/cmake/Macros.cmake")
     ApplyTurfBuildSettings()
     add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/.." junction)