luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: fixed glog-modules.cmake installation

Browse Source
This commit is contained in:
Sergiu Deitsch 2021-11-11 22:22:51 +01:00
parent 4df5ae7463
commit 64b4e327ff
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.github/workflows/linux-builds.yml vendored
View File

@ -41,11 +41,13 @@ jobs:
-G Ninja -G Ninja
cmake --build build-googletest --target install cmake --build build-googletest --target install
- name: Setup Environment
if: ${{matrix.build_type == 'Debug'}}
run: |
echo 'CXXFLAGS=--coverage' >> $GITHUB_ENV
- name: Configure - name: Configure
run: | run: |
if [[ ${{matrix.build_type}} == "Debug" ]]; then
export CXXFLAGS=--coverage
fi
cmake -S . -B build_${{matrix.build_type}} -G Ninja \ cmake -S . -B build_${{matrix.build_type}} -G Ninja \
-DBUILD_SHARED_LIBS=${{matrix.shared}} \ -DBUILD_SHARED_LIBS=${{matrix.shared}} \
-DCMAKE_CXX_STANDARD=${{matrix.std}} \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \
@ -64,18 +66,34 @@ jobs:
--config ${{matrix.build_type}} \ --config ${{matrix.build_type}} \
--target install --target install
- name: Test CMake Package cmake build_${{matrix.build_type}} -G Ninja \
-DCMAKE_INSTALL_INCLUDEDIR=${{runner.workspace}}/foo/include \
-DCMAKE_INSTALL_LIBDIR=${{runner.workspace}}/foo/lib \
-DCMAKE_INSTALL_DATAROOTDIR=${{runner.workspace}}/foo/share
cmake --build build_${{matrix.build_type}} \
--config ${{matrix.build_type}} \
--target install
- name: Test CMake Package (relative GNUInstallDirs)
run: | run: |
if [[ ${{matrix.build_type}} == "Debug" ]]; then
export CXXFLAGS=--coverage
fi
cmake -S src/package_config_unittest/working_config \ cmake -S src/package_config_unittest/working_config \
-B build_${{matrix.build_type}}_package \ -B build_${{matrix.build_type}}_package \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_PREFIX_PATH=./build_${{matrix.build_type}}/install \ -DCMAKE_PREFIX_PATH=./build_${{matrix.build_type}}/install \
-G Ninja -G Ninja
cmake --build build_${{matrix.build_type}}_package \ cmake --build build_${{matrix.build_type}}_package \
--config ${{matrix.build_type}} --config ${{matrix.build_type}}
- name: Test CMake Package (absolute GNUInstallDirs)
run: |
cmake -S src/package_config_unittest/working_config \
-B build_${{matrix.build_type}}_package_foo \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/foo \
-G Ninja
cmake --build build_${{matrix.build_type}}_package_foo \
--config ${{matrix.build_type}}
- name: Test - name: Test
run: | run: |
ctest --test-dir build_${{matrix.build_type}} -j$(nproc) --output-on-failure ctest --test-dir build_${{matrix.build_type}} -j$(nproc) --output-on-failure

8
CMakeLists.txt
View File

@ -1022,12 +1022,18 @@ configure_file (glog-modules.cmake.in
install (CODE install (CODE
" "
set (glog_FULL_CMake_DATADIR \"\\\${CMAKE_CURRENT_LIST_DIR}/${glog_REL_CMake_DATADIR}\") set (glog_FULL_CMake_DATADIR \"\\\${CMAKE_CURRENT_LIST_DIR}/${glog_REL_CMake_DATADIR}\")
set (glog_DATADIR_DESTINATION ${_glog_CMake_INSTALLDIR})
if (NOT IS_ABSOLUTE ${_glog_CMake_INSTALLDIR})
set (glog_DATADIR_DESTINATION \"\${CMAKE_INSTALL_PREFIX}/\${glog_DATADIR_DESTINATION}\")
endif (NOT IS_ABSOLUTE ${_glog_CMake_INSTALLDIR})
configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\" configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\"
\"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" @ONLY) \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" @ONLY)
file (INSTALL file (INSTALL
\"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\"
DESTINATION DESTINATION
\"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\") \"\${glog_DATADIR_DESTINATION}\")
" "
COMPONENT Development COMPONENT Development
) )