gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix CMakeLists for include as a thirdparty in projects

Browse Source
This commit is contained in:
Phyks 2015-05-12 00:23:50 +02:00
parent 7eb117a26e
commit 89ad34cef4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1,5 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8) CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules) SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
PROJECT(RapidJSON CXX) PROJECT(RapidJSON CXX)
@ -45,7 +45,7 @@ ELSEIF(WIN32)
ENDIF() ENDIF()
SET(CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" CACHE PATH "The directory cmake fiels are installed in") SET(CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" CACHE PATH "The directory cmake fiels are installed in")
include_directories(${CMAKE_SOURCE_DIR}/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
if(RAPIDJSON_BUILD_DOC) if(RAPIDJSON_BUILD_DOC)
add_subdirectory(doc) add_subdirectory(doc)

3
CMakeModules/FindGTestSrc.cmake
View File

@ -1,7 +1,7 @@
SET(GTEST_SEARCH_PATH SET(GTEST_SEARCH_PATH
"${GTEST_SOURCE_DIR}" "${GTEST_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/thirdparty/gtest") "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/gtest")
IF(UNIX) IF(UNIX)
IF(RAPIDJSON_BUILD_THIRDPARTY_GTEST) IF(RAPIDJSON_BUILD_THIRDPARTY_GTEST)
@ -15,6 +15,7 @@ FIND_PATH(GTEST_SOURCE_DIR
NAMES CMakeLists.txt src/gtest_main.cc NAMES CMakeLists.txt src/gtest_main.cc
PATHS ${GTEST_SEARCH_PATH}) PATHS ${GTEST_SEARCH_PATH})
# Debian installs gtest include directory in /usr/include, thus need to look # Debian installs gtest include directory in /usr/include, thus need to look
# for include directory separately from source directory. # for include directory separately from source directory.
FIND_PATH(GTEST_INCLUDE_DIR FIND_PATH(GTEST_INCLUDE_DIR