Skip to content

Commit 46972b3

Browse files
committed
Set policy CMP0177 and follow the documented recommendations regarding DESTINATION paths.
1 parent 04f9e11 commit 46972b3

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ endif()
1414
if (POLICY CMP0167)
1515
cmake_policy(SET CMP0167 OLD)
1616
endif()
17+
# CMake 3.31+ Use normalization rules on install DESTINATION
18+
# command. We shouldn't be impacted so allow the new behavior.
19+
if (POLICY CMP0177)
20+
cmake_policy(SET CMP0177 NEW)
21+
endif()
1722

1823
project (gnucash
1924
VERSION 5.12

common/cmake_modules/GncAddSchemeTargets.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ function(gnc_add_scheme_targets _TARGET)
309309
if(SCHEME_TGT_TEST)
310310
add_dependencies(check ${_TARGET})
311311
else()
312-
install(FILES ${_TARGET_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITECCACHEDIR}/${SCHEME_TGT_OUTPUT_DIR})
313-
install(FILES ${SCHEME_TGT_SOURCES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITEDIR}/${SCHEME_TGT_OUTPUT_DIR})
312+
install(FILES ${_TARGET_FILES} DESTINATION ${GUILE_REL_SITECCACHEDIR}/${SCHEME_TGT_OUTPUT_DIR})
313+
install(FILES ${SCHEME_TGT_SOURCES} DESTINATION ${GUILE_REL_SITEDIR}/${SCHEME_TGT_OUTPUT_DIR})
314314
endif()
315315
endfunction()
316316

common/cmake_modules/GncAddTest.cmake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ function(get_guile_env)
2626
list(APPEND env "PATH=${fpath}")
2727
set(compiled_path "${CMAKE_BINARY_DIR}/${GUILE_REL_SITECCACHEDIR}")
2828
string(REGEX REPLACE "^([A-Za-z]):" "/\\1" compiled_path ${compiled_path})
29+
string(REGEX REPLACE "\\\\" "/" compiled_path ${compiled_path})
2930
list(APPEND env GUILE_LOAD_COMPILED_PATH=${compiled_path})
3031
endif()
3132
list(APPEND env "GNC_MODULE_PATH=${_GNC_MODULE_PATH}")
@@ -54,19 +55,21 @@ function(get_guile_env)
5455
if (MINGW64)
5556
set(new_path "")
5657
foreach(load_item ${guile_load_path})
57-
string(REGEX REPLACE "^([A-Za-z]):" "/\\1" load_item ${load_item})
58+
# string(REGEX REPLACE "^([A-Za-z]):" "/\\1" load_item ${load_item})
59+
string(REGEX REPLACE "\\\\" "/" load_item ${load_item})
5860
list(APPEND new_path ${load_item})
5961
endforeach(load_item)
6062
set(guile_load_path ${new_path})
6163

6264
set(new_path "")
6365
foreach(load_item ${guile_load_compiled_path})
64-
string(REGEX REPLACE "^([A-Za-z]):" "/\\1" load_item ${load_item})
66+
# string(REGEX REPLACE "^([A-Za-z]):" "/\\1" load_item ${load_item})
67+
string(REGEX REPLACE "\\\\" "/" load_item ${load_item})
6568
list(APPEND new_path ${load_item})
6669
endforeach(load_item)
6770
set(guile_load_compiled_path ${new_path})
6871
endif()
69-
if (WIN32 AND NOT MINGW64)
72+
if (WIN32)
7073
string(REPLACE ";" "\\\\;" GUILE_LOAD_PATH "${guile_load_path}")
7174
string(REPLACE ";" "\\\\;" GUILE_LOAD_COMPILED_PATH "${guile_load_compiled_path}")
7275
else()

libgnucash/backend/dbi/test/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ set(test_dbi_backend_HEADERS test-dbi-business-stuff.h test-dbi-stuff.h)
3434

3535
set_dist_list(test_dbi_backend_DIST ${test_dbi_backend_SOURCES} ${test_dbi_backend_HEADERS} test-dbi.xml CMakeLists.txt )
3636

37-
# This test does not work on Win32
3837
if (WITH_SQL)
3938
gnc_add_test(test-backend-dbi "${test_dbi_backend_SOURCES}"
4039
BACKEND_DBI_TEST_INCLUDE_DIRS BACKEND_DBI_TEST_LIBS

0 commit comments

Comments
 (0)