From b21335642e75b35d3b178a754f4cdb2314989cd1 Mon Sep 17 00:00:00 2001 From: Thomas Winget Date: Mon, 9 Mar 2015 15:48:46 -0400 Subject: Moved db_drivers/ into external/ for consistency --- external/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'external/CMakeLists.txt') diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 80e574b06..245758d9f 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -97,3 +97,5 @@ else() die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent") endif() endif() + +add_subdirectory(db_drivers) -- cgit v1.2.3 From 8b82f3c57ffdc4dc190f4755c61d74d8359c8c0f Mon Sep 17 00:00:00 2001 From: Thomas Winget Date: Tue, 10 Mar 2015 12:51:23 -0400 Subject: Build fixed, goofed up some CMake Forgot that CMake vars set to PARENT_SCOPE will still vanish if that parent scope goes...out of scope. LMDB vars elevated one more scope to compensate for moving db_drivers/ into external/ --- external/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'external/CMakeLists.txt') diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 245758d9f..f0d363e35 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -99,3 +99,7 @@ else() endif() add_subdirectory(db_drivers) +set(LMDB_STATIC ${LMDB_STATIC} PARENT_SCOPE) +set(LMDB_INCLUDE ${LMDB_INCLUDE} PARENT_SCOPE) +set(LMDB_LIBRARY ${LMDB_LIBRARY} PARENT_SCOPE) +set(LMDB_LIBRARY_DIRS ${LMDB_LIBRARY_DIRS} PARENT_SCOPE) -- cgit v1.2.3 From daf2a8f6cb9e76535af354f97fbb803d35e8c786 Mon Sep 17 00:00:00 2001 From: Thomas Winget Date: Tue, 17 Mar 2015 18:01:07 -0400 Subject: Revert "Build fixed, goofed up some CMake" This reverts commit 8b82f3c57ffdc4dc190f4755c61d74d8359c8c0f. --- external/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) (limited to 'external/CMakeLists.txt') diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index f0d363e35..245758d9f 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -99,7 +99,3 @@ else() endif() add_subdirectory(db_drivers) -set(LMDB_STATIC ${LMDB_STATIC} PARENT_SCOPE) -set(LMDB_INCLUDE ${LMDB_INCLUDE} PARENT_SCOPE) -set(LMDB_LIBRARY ${LMDB_LIBRARY} PARENT_SCOPE) -set(LMDB_LIBRARY_DIRS ${LMDB_LIBRARY_DIRS} PARENT_SCOPE) -- cgit v1.2.3 From 11e815761f31b84d96c37cc621c58669ce0c3d1b Mon Sep 17 00:00:00 2001 From: Thomas Winget Date: Tue, 17 Mar 2015 18:03:11 -0400 Subject: Revert "Moved db_drivers/ into external/ for consistency" This reverts commit b21335642e75b35d3b178a754f4cdb2314989cd1. --- external/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'external/CMakeLists.txt') diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 245758d9f..80e574b06 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -97,5 +97,3 @@ else() die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent") endif() endif() - -add_subdirectory(db_drivers) -- cgit v1.2.3 From 6e9e8ab6205fe072355bd020690dbdc2d3259bf8 Mon Sep 17 00:00:00 2001 From: Thomas Winget Date: Tue, 17 Mar 2015 18:55:24 -0400 Subject: Move db_drivers/ to external/ Also change LMDB Cmake variables to CACHE rather than upgrading them through several parent scopes. --- external/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'external/CMakeLists.txt') diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 80e574b06..245758d9f 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -97,3 +97,5 @@ else() die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent") endif() endif() + +add_subdirectory(db_drivers) -- cgit v1.2.3