Repository: zookeeper Updated Branches: refs/heads/master 673785122 -> 9ba4aeb4f
ZOOKEEPER-2999: CMake build should use target-level commands CMake is using `include_directories`, which has global side effects, instead of the more explicit `target_include_directories`, to include directories per target (and with private or public scoping). Furthermore, CMake should also use `CMAKE_CURRENT_SOURCE_DIR` over `CMAKE_SOURCE_DIR` in order to allow inclusion in other projects via `add_subdirectory()`, and we can reduce the minimally required CMake version to 3.5 from 3.6. Author: proller <prol...@github.com> Reviewers: Michael Han <h...@apache.org> Closes #486 from andschwa/ZOOKEEPER-2999 Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/9ba4aeb4 Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/9ba4aeb4 Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/9ba4aeb4 Branch: refs/heads/master Commit: 9ba4aeb4f92c1fc3167ff8e2b56e02f3e344d3ba Parents: 6737851 Author: proller <prol...@github.com> Authored: Sun Apr 15 21:29:43 2018 -0700 Committer: Michael Han <h...@apache.org> Committed: Sun Apr 15 21:29:43 2018 -0700 ---------------------------------------------------------------------- src/c/CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/9ba4aeb4/src/c/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/c/CMakeLists.txt b/src/c/CMakeLists.txt index f9b7b90..b0e0d39 100644 --- a/src/c/CMakeLists.txt +++ b/src/c/CMakeLists.txt @@ -14,14 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.5) project(zookeeper VERSION 3.6.0) set(email u...@zookeeper.apache.org) set(description "zookeeper C client") # general options -include_directories(include tests generated ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) if(UNIX) add_compile_options(-Wall -fPIC) elseif(WIN32) @@ -77,7 +76,7 @@ endfunction() # include file checks foreach(f generated/zookeeper.jute.h generated/zookeeper.jute.c) - if(EXISTS "${CMAKE_SOURCE_DIR}/${f}") + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${f}") to_have(${f} name) set(${name} 1) else() @@ -149,7 +148,7 @@ include(CheckStructHasMember) check_struct_has_member("struct sockaddr_in6" sin6_addr "netinet/in.h" ZOO_IPV6_ENABLED) # configure -configure_file(cmake_config.h.in ${CMAKE_SOURCE_DIR}/include/config.h) +configure_file(cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/config.h) # hashtable library set(hashtable_sources src/hashtable/hashtable_itr.c src/hashtable/hashtable.c) @@ -176,6 +175,7 @@ if(WIN32) endif() add_library(zookeeper STATIC ${zookeeper_sources}) +target_include_directories(zookeeper PUBLIC include ${CMAKE_CURRENT_BINARY_DIR}/include generated) target_link_libraries(zookeeper PUBLIC hashtable $<$<PLATFORM_ID:Linux>:rt> # clock_gettime @@ -223,8 +223,10 @@ endif() if(WANT_CPPUNIT) add_executable(zktest ${test_sources}) + target_include_directories(zktest PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) + target_compile_definitions(zktest - PRIVATE -DZKSERVER_CMD="${CMAKE_SOURCE_DIR}/tests/zkServer.sh") + PRIVATE -DZKSERVER_CMD="${CMAKE_CURRENT_SOURCE_DIR}/tests/zkServer.sh") # TODO: Use `find_library()` for `cppunit`. target_link_libraries(zktest zookeeper cppunit dl) @@ -241,6 +243,6 @@ if(WANT_CPPUNIT) enable_testing() add_test(NAME zktest_runner COMMAND zktest) set_property(TEST zktest_runner PROPERTY ENVIRONMENT - "ZKROOT=${CMAKE_SOURCE_DIR}/../.." + "ZKROOT=${CMAKE_CURRENT_SOURCE_DIR}/../.." "CLASSPATH=$CLASSPATH:$CLOVER_HOME/lib/clover.jar") endif()
