diff options
| author | Howard Butler <howard@hobu.co> | 2015-02-22 23:06:13 +0000 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2015-02-22 23:06:13 +0000 |
| commit | 4f2ff5857f6f554b7e5c25c139d8064e031c7b73 (patch) | |
| tree | a94374c80c26ee16a3ce9440a6dcd9f2b5712b98 /src | |
| parent | 41d8647cdff0c7550b77e7d225e2578ea736d777 (diff) | |
| download | PROJ-4f2ff5857f6f554b7e5c25c139d8064e031c7b73.tar.gz PROJ-4f2ff5857f6f554b7e5c25c139d8064e031c7b73.zip | |
More CMake churn #264
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2632 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 77d5d6f5..7c84fabc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,14 +11,14 @@ option(BUILD_NAD2BIN "Build nad2bin (format conversion tool) " ON) if(NOT MSVC) if (NOT APPLE) # Use relative path so that package is relocatable - set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib") + set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${LIBDIR}") else () - set (CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") + set (CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}") # TO DO: cmake 2.8.12 introduces a way to make the install tree # relocatable with OSX via # (1) set(CMAKE_MACOSX_RPATH ON) and # (2) setting the INSTALL_RPATH property on the executables to - # "@loader_path/../lib" + # "@loader_path/../${LIBDIR}" endif () endif () diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index e0ed351b..8111c7aa 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -264,17 +264,20 @@ add_library( ${PROJ_CORE_TARGET} if(WIN32) set_target_properties(${PROJ_CORE_TARGET} PROPERTIES + VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}" OUTPUT_NAME "${PROJ_CORE_TARGET_OUTPUT_NAME}" CLEAN_DIRECT_OUTPUT 1) elseif(BUILD_FRAMEWORKS_AND_BUNDLE) set_target_properties(${PROJ_CORE_TARGET} PROPERTIES + VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}" INSTALL_NAME_DIR ${PROJ_INSTALL_NAME_DIR} CLEAN_DIRECT_OUTPUT 1) else() set_target_properties(${PROJ_CORE_TARGET} PROPERTIES - SOVERSION "${${PROJECT_INTERN_NAME}_SOVERSION}" + VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}" + SOVERSION "${${PROJECT_INTERN_NAME}_API_VERSION}" CLEAN_DIRECT_OUTPUT 1) endif() @@ -288,7 +291,9 @@ set_target_properties(${PROJ_CORE_TARGET} set(PROJ_LIBRARIES ${PROJ_CORE_TARGET} ) if(UNIX AND BUILD_LIBPROJ_SHARED) find_library(M_LIB m) - TARGET_LINK_LIBRARIES(${PROJ_CORE_TARGET} ${M_LIB}) + if(M_LIB) + TARGET_LINK_LIBRARIES(${PROJ_CORE_TARGET} -lm) + endif() endif(UNIX AND BUILD_LIBPROJ_SHARED) if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT AND BUILD_LIBPROJ_SHARED) TARGET_LINK_LIBRARIES(${PROJ_CORE_TARGET} ${CMAKE_THREAD_LIBS_INIT}) @@ -299,6 +304,7 @@ endif(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT AND BUILD_LIBPROJ # install ############################################## install(TARGETS ${PROJ_CORE_TARGET} + EXPORT targets RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR} |