40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -14,22 +14,16 @@
|
|
set(LIBMSYM_PATCH_VERSION 4)
|
|
set(LIBMSYM_VERSION ${LIBMSYM_MAJOR_VERSION}.${LIBMSYM_MINOR_VERSION}.${LIBMSYM_PATCH_VERSION})
|
|
|
|
+set(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for msym runtime library")
|
|
set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for msym library")
|
|
set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
|
|
|
|
-if(WIN32 AND NOT CYGWIN)
|
|
+if(MSVC)
|
|
set(DEF_INSTALL_CMAKE_DIR CMake)
|
|
else()
|
|
set(DEF_INSTALL_CMAKE_DIR lib/cmake/libmsym)
|
|
endif()
|
|
set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
|
|
-
|
|
-foreach(p LIB BIN INCLUDE CMAKE)
|
|
- set(var INSTALL_${p}_DIR)
|
|
- if(NOT IS_ABSOLUTE "${${var}}")
|
|
- set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
|
|
- endif()
|
|
-endforeach()
|
|
|
|
include_directories("${PROJECT_SOURCE_DIR}")
|
|
|
|
@@ -79,10 +73,9 @@
|
|
|
|
export(PACKAGE libmsym)
|
|
|
|
-file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}")
|
|
set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
|
|
configure_file(libmsymConfig.cmake.in "${PROJECT_BINARY_DIR}/libmsymConfig.cmake" @ONLY)
|
|
-set(CONF_INCLUDE_DIRS "\${LIBMSYM_CMAKE_DIR}/${REL_INCLUDE_DIR}")
|
|
+set(CONF_INCLUDE_DIRS "\${LIBMSYM_CMAKE_DIR}/../../../include")
|
|
configure_file(libmsymConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/libmsymConfig.cmake" @ONLY)
|
|
configure_file(libmsymConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/libmsymConfigVersion.cmake" @ONLY)
|
|
|