@@ -46,25 +46,17 @@ endmacro()
46
46
#
47
47
macro (pyamrex_set_default_build_dirs)
48
48
if (NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY )
49
- set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /lib"
50
- CACHE PATH "Build directory for archives" )
51
- mark_as_advanced (CMAKE_ARCHIVE_OUTPUT_DIRECTORY )
49
+ set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /lib" )
52
50
endif ()
53
51
if (NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY )
54
- set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /lib"
55
- CACHE PATH "Build directory for libraries" )
56
- mark_as_advanced (CMAKE_LIBRARY_OUTPUT_DIRECTORY )
52
+ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /lib" )
57
53
endif ()
58
54
if (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY )
59
- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /bin"
60
- CACHE PATH "Build directory for binaries" )
61
- mark_as_advanced (CMAKE_RUNTIME_OUTPUT_DIRECTORY )
55
+ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /bin" )
62
56
endif ()
63
57
if (NOT CMAKE_PYTHON_OUTPUT_DIRECTORY)
64
58
set (CMAKE_PYTHON_OUTPUT_DIRECTORY
65
- "${CMAKE_LIBRARY_OUTPUT_DIRECTORY} /site-packages"
66
- CACHE PATH "Build directory for python modules"
67
- )
59
+ "${CMAKE_LIBRARY_OUTPUT_DIRECTORY} /site-packages" )
68
60
endif ()
69
61
endmacro ()
70
62
@@ -77,14 +69,12 @@ macro(pyamrex_set_default_install_dirs)
77
69
if (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR )
78
70
include (GNUInstallDirs)
79
71
if (NOT CMAKE_INSTALL_CMAKEDIR)
80
- set (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR} /cmake"
81
- CACHE PATH "CMake config package location for installed targets" )
82
72
if (WIN32 )
83
- set (CMAKE_INSTALL_LIBDIR Lib
84
- CACHE PATH "Object code libraries" )
85
- set_property (CACHE CMAKE_INSTALL_CMAKEDIR PROPERTY VALUE "cmake" )
73
+ set (CMAKE_INSTALL_LIBDIR Lib)
74
+ set (CMAKE_INSTALL_CMAKEDIR "cmake" )
75
+ else ()
76
+ set (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR} /cmake" )
86
77
endif ()
87
- mark_as_advanced (CMAKE_INSTALL_CMAKEDIR)
88
78
endif ()
89
79
endif ()
90
80
0 commit comments