Improve resolving ROOT_DIR

diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
index 4805cc2c95b470ddf641ebc6454f0b2df58efd05..d0f6daade3dc42e3af7d739d2bbdc7e9b2862f31 100644 (file)
--- a/build/cmake/CMakeLists.txt
+++ b/build/cmake/CMakeLists.txt
@@ -9,6 +9,7 @@
 
 PROJECT(zstd)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
+SET(ZSTD_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../..")
 
 OPTION(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF)
 OPTION(ZSTD_MULTITHREAD_SUPPORT "MULTITHREADING SUPPORT" ON)

diff --git a/build/cmake/contrib/pzstd/CMakeLists.txt b/build/cmake/contrib/pzstd/CMakeLists.txt
index 2a3663f31ff5f9f9020e4210964cef613ee5ba3d..f89be890160dba562865a887f88e10d0ff94552f 100644 (file)
--- a/build/cmake/contrib/pzstd/CMakeLists.txt
+++ b/build/cmake/contrib/pzstd/CMakeLists.txt
@@ -14,13 +14,10 @@ PROJECT(pzstd)
 
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
-# Define project root directory
-SET(ROOT_DIR ../../../..)
-
 # Define programs directory, where sources and header files are located
-SET(LIBRARY_DIR ${ROOT_DIR}/lib)
-SET(PROGRAMS_DIR ${ROOT_DIR}/programs)
-SET(PZSTD_DIR ${ROOT_DIR}/contrib/pzstd)
+SET(LIBRARY_DIR ${ZSTD_SOURCE_DIR}/lib)
+SET(PROGRAMS_DIR ${ZSTD_SOURCE_DIR}/programs)
+SET(PZSTD_DIR ${ZSTD_SOURCE_DIR}/contrib/pzstd)
 INCLUDE_DIRECTORIES(${PROGRAMS_DIR} ${LIBRARY_DIR} ${LIBRARY_DIR}/common ${PZSTD_DIR})
 
 ADD_EXECUTABLE(pzstd ${PZSTD_DIR}/main.cpp ${PZSTD_DIR}/Options.cpp ${PZSTD_DIR}/Pzstd.cpp ${PZSTD_DIR}/SkippableFrame.cpp)

diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index 1950d97cd1f24352ad24a10f67e5dded5015e343..ffb6bd4a3a77c58b3ada552bda4bd6131442b3f9 100644 (file)
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -22,11 +22,8 @@ PROJECT(libzstd)
 
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
-# Define project root directory
-SET(ROOT_DIR ../../..)
-
 # Define library directory, where sources and header files are located
-SET(LIBRARY_DIR ${ROOT_DIR}/lib)
+SET(LIBRARY_DIR ${ZSTD_SOURCE_DIR}/lib)
 INCLUDE_DIRECTORIES(${LIBRARY_DIR} ${LIBRARY_DIR}/common)
 
 # Read file content
@@ -97,7 +94,7 @@ IF (ZSTD_LEGACY_SUPPORT)
 ENDIF (ZSTD_LEGACY_SUPPORT)
 
 IF (MSVC)
-    SET(MSVC_RESOURCE_DIR ${ROOT_DIR}/build/VS2010/libzstd-dll)
+    SET(MSVC_RESOURCE_DIR ${ZSTD_SOURCE_DIR}/build/VS2010/libzstd-dll)
     SET(PlatformDependResources ${MSVC_RESOURCE_DIR}/libzstd-dll.rc)
 ENDIF (MSVC)
 

diff --git a/build/cmake/programs/CMakeLists.txt b/build/cmake/programs/CMakeLists.txt
index c88ee5cc993f29934fca6fc320a3160d6d3851a8..38b4c1e7dac680376ab5bdca250a66dadefd5c24 100644 (file)
--- a/build/cmake/programs/CMakeLists.txt
+++ b/build/cmake/programs/CMakeLists.txt
@@ -14,12 +14,9 @@ PROJECT(programs)
 
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
-# Define project root directory
-SET(ROOT_DIR ../../..)
-
 # Define programs directory, where sources and header files are located
-SET(LIBRARY_DIR ${ROOT_DIR}/lib)
-SET(PROGRAMS_DIR ${ROOT_DIR}/programs)
+SET(LIBRARY_DIR ${ZSTD_SOURCE_DIR}/lib)
+SET(PROGRAMS_DIR ${ZSTD_SOURCE_DIR}/programs)
 INCLUDE_DIRECTORIES(${PROGRAMS_DIR} ${LIBRARY_DIR} ${LIBRARY_DIR}/common ${LIBRARY_DIR}/compress ${LIBRARY_DIR}/dictBuilder)
 
 IF (ZSTD_LEGACY_SUPPORT)
@@ -28,7 +25,7 @@ IF (ZSTD_LEGACY_SUPPORT)
 ENDIF (ZSTD_LEGACY_SUPPORT)
 
 IF (MSVC)
-    SET(MSVC_RESOURCE_DIR ${ROOT_DIR}/build/VS2010/zstd)
+    SET(MSVC_RESOURCE_DIR ${ZSTD_SOURCE_DIR}/build/VS2010/zstd)
     SET(PlatformDependResources ${MSVC_RESOURCE_DIR}/zstd.rc)
 ENDIF (MSVC)
 

diff --git a/build/cmake/tests/CMakeLists.txt b/build/cmake/tests/CMakeLists.txt
index 53a6994490cabfcd56fdabbc063b9c4fbc6dad60..cb327e48cbe6b40fd6e75ce532381d77545dc7da 100644 (file)
--- a/build/cmake/tests/CMakeLists.txt
+++ b/build/cmake/tests/CMakeLists.txt
@@ -34,13 +34,10 @@ PROJECT(tests)
 
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
-# Define project root directory
-SET(ROOT_DIR ../../..)
-
 # Define programs directory, where sources and header files are located
-SET(LIBRARY_DIR ${ROOT_DIR}/lib)
-SET(PROGRAMS_DIR ${ROOT_DIR}/programs)
-SET(TESTS_DIR ${ROOT_DIR}/tests)
+SET(LIBRARY_DIR ${ZSTD_SOURCE_DIR}/lib)
+SET(PROGRAMS_DIR ${ZSTD_SOURCE_DIR}/programs)
+SET(TESTS_DIR ${ZSTD_SOURCE_DIR}/tests)
 INCLUDE_DIRECTORIES(${TESTS_DIR} ${PROGRAMS_DIR} ${LIBRARY_DIR} ${LIBRARY_DIR}/common ${LIBRARY_DIR}/compress ${LIBRARY_DIR}/dictBuilder)
 
 ADD_EXECUTABLE(fullbench ${PROGRAMS_DIR}/datagen.c ${TESTS_DIR}/fullbench.c)