diff --git a/CMakeLists.txt b/CMakeLists.txt index 377a05a..44a1791 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ # PmLogLib/CMakeLists.txt # -cmake_minimum_required (VERSION 2.8.7) +cmake_minimum_required (VERSION 3.5) if(BUILD_PRIVATE) project(PmLogLib NONE) @@ -43,7 +43,7 @@ endif() # To enable this option run "cmake -D BUILD_PRIVATE=ON" if(BUILD_PRIVATE) webos_build_pkgconfig(files/pkgconfig/PmLogLib-private) - install(DIRECTORY "include/private/" DESTINATION @WEBOS_INSTALL_INCLUDEDIR@ FILES_MATCHING PATTERN "*.h" PATTERN ".*" EXCLUDE) + install(DIRECTORY "include/private/" DESTINATION ${WEBOS_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h" PATTERN ".*" EXCLUDE) return() endif() @@ -54,7 +54,7 @@ endif() if(NOT BUILD_WITHOUT_HEADERS) webos_build_pkgconfig(files/pkgconfig/PmLogLib-headers) webos_configure_header_files(include/public INSTALL) - install(DIRECTORY "include/public/" DESTINATION @WEBOS_INSTALL_INCLUDEDIR@ FILES_MATCHING PATTERN "*.h" PATTERN ".*" EXCLUDE) + install(DIRECTORY "include/public/" DESTINATION ${WEBOS_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h" PATTERN ".*" EXCLUDE) if(SHIP_HEADERS_ONLY) return() endif() diff --git a/cxx/CMakeLists.txt b/cxx/CMakeLists.txt index 7743710..1174b8d 100644 --- a/cxx/CMakeLists.txt +++ b/cxx/CMakeLists.txt @@ -32,4 +32,4 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) add_library(PmLogLibCpp SHARED PmLog.cpp) target_link_libraries(PmLogLibCpp ${CMAKE_PROJECT_NAME}) webos_build_library(NAME PmLogLibCpp NOHEADERS) -install(FILES PmLog.h DESTINATION @WEBOS_INSTALL_INCLUDEDIR@) +install(FILES PmLog.h DESTINATION ${WEBOS_INSTALL_INCLUDEDIR})