diff options
| author | Alan D. Snow <alansnow21@gmail.com> | 2019-02-18 08:56:55 -0600 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2019-02-18 15:56:55 +0100 |
| commit | 97016c7f7b74bd473c446ee128d1774209eddfc0 (patch) | |
| tree | ba2280df6a7e16bae5038fa20b07aade887803bc | |
| parent | 4277e15cefae5bb1d49312498e0f626b652e7524 (diff) | |
| download | PROJ-97016c7f7b74bd473c446ee128d1774209eddfc0.tar.gz PROJ-97016c7f7b74bd473c446ee128d1774209eddfc0.zip | |
Windows CMAKE Paths to match osx/linux (#1274)
Addressing issue #1177.
| -rw-r--r-- | appveyor.yml | 22 | ||||
| -rw-r--r-- | cmake/ProjInstallPath.cmake | 11 |
2 files changed, 11 insertions, 22 deletions
diff --git a/appveyor.yml b/appveyor.yml index 3eb69d51..728e77c9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,26 +32,22 @@ build_script: - if "%platform%" == "x86" SET BUILD_LIBPROJ_SHARED=OFF - echo "%VS_FULL%" # - - if "%platform%" == "x64" mkdir build_dll - - if "%platform%" == "x64" cd build_dll - - if "%platform%" == "x86" mkdir build_static - - if "%platform%" == "x86" cd build_static - - cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED="%BUILD_LIBPROJ_SHARED%" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%CD%/install" + - set PROJ_BUILD=%APPVEYOR_BUILD_FOLDER%\build + - mkdir %PROJ_BUILD% + - cd %PROJ_BUILD% + - set PROJ_DIR=%APPVEYOR_BUILD_FOLDER%\proj_dir + - cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED="%BUILD_LIBPROJ_SHARED%" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%PROJ_DIR%" - cmake --build . --config Release --target install - - cd .. test_script: - echo test_script - - if "%platform%" == "x64" cd build_dll - - if "%platform%" == "x86" cd build_static - - set CURDIR=%CD% - - set PROJ_LIB=%CD%\install\share + - set PROJ_LIB=%PROJ_DIR%\share\proj - cd %PROJ_LIB% - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.7.zip - 7z e -aoa -y proj-datumgrid-1.7.zip - - dir - - cd %CURDIR% + - cd %PROJ_BUILD% - ctest -V -C Release - - cd .. + - set PATH=%PATH%;%PROJ_DIR%\bin + - proj deploy: off diff --git a/cmake/ProjInstallPath.cmake b/cmake/ProjInstallPath.cmake index 72ffbac2..b42f927f 100644 --- a/cmake/ProjInstallPath.cmake +++ b/cmake/ProjInstallPath.cmake @@ -23,14 +23,7 @@ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # for data install testing the PROJ_LIB envVar string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER) -if(WIN32) - set(DEFAULT_BIN_SUBDIR bin) - set(DEFAULT_LIB_SUBDIR local/lib) - set(DEFAULT_DATA_SUBDIR share) - set(DEFAULT_INCLUDE_SUBDIR local/include) - set(DEFAULT_DOC_SUBDIR share/doc/proj) - set(DEFAULT_CMAKE_SUBDIR local/lib/cmake/${PROJECT_NAME_LOWER}) -elseif(UNIX) +if(UNIX) include(GNUInstallDirs) set(DEFAULT_BIN_SUBDIR ${CMAKE_INSTALL_BINDIR}) set(DEFAULT_LIB_SUBDIR ${CMAKE_INSTALL_LIBDIR}) @@ -39,7 +32,7 @@ elseif(UNIX) set(DEFAULT_DOC_SUBDIR ${CMAKE_INSTALL_DOCDIR}) set(DEFAULT_CMAKE_SUBDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER}) else() - # Common locatoins for Unix and Mac OS X + # Common locations for Unix and Mac OS X set(DEFAULT_BIN_SUBDIR bin) set(DEFAULT_LIB_SUBDIR lib) set(DEFAULT_DATA_SUBDIR share/proj) |