diff options
| author | Mike Taves <mwtoews@gmail.com> | 2020-03-28 12:44:30 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-28 12:44:30 +1300 |
| commit | 54fdb90a204a39342bfcbab197e3b5da47a9f1cd (patch) | |
| tree | d4d8189638c263b3f203db15579a820c9eef214a /CMakeLists.txt | |
| parent | 238f48fb7cd006296cbd622ab9e4187139af9a8e (diff) | |
| download | PROJ-54fdb90a204a39342bfcbab197e3b5da47a9f1cd.tar.gz PROJ-54fdb90a204a39342bfcbab197e3b5da47a9f1cd.zip | |
CMake: prefer to use use PROJ_SOURCE_DIR and PROJ_BINARY_DIR (#2100)
* Use instead of CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR
* Also PROJECT_SOURCE_DIR and PROJECT_BINARY_DIR, which are similar
* Set properties with a list variable rather than a long line
* Correction to 'proj_test_set_properties' function, rename ENVIRONMENT:
- PROJ_IGNORE_USER_WRITABLE_DIRECTORY (ignored)
- PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY (used by filemanager.cpp)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 18a90b44..bad926ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,9 +225,9 @@ endif() # top of the build tree rather than in hard-to-find leaf # directories. This simplifies manual testing and the use of the build # tree rather than installed PROJ libraries. -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJ_BINARY_DIR}/lib) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJ_BINARY_DIR}/lib) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJ_BINARY_DIR}/bin) link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) ################################################################################ |