Skip to content

Commit 3f406a2

Browse files
committed
CMake Defaults: No Cache
Setting this w/o cache limits the scope to the current project and does not influence superprojects that do not set the same variables.
1 parent 557eb5c commit 3f406a2

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

cmake/pyAMReXFunctions.cmake

+8-18
Original file line numberDiff line numberDiff line change
@@ -46,25 +46,17 @@ endmacro()
4646
#
4747
macro(pyamrex_set_default_build_dirs)
4848
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")
5250
endif()
5351
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")
5753
endif()
5854
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")
6256
endif()
6357
if(NOT CMAKE_PYTHON_OUTPUT_DIRECTORY)
6458
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")
6860
endif()
6961
endmacro()
7062

@@ -77,14 +69,12 @@ macro(pyamrex_set_default_install_dirs)
7769
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
7870
include(GNUInstallDirs)
7971
if(NOT CMAKE_INSTALL_CMAKEDIR)
80-
set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake"
81-
CACHE PATH "CMake config package location for installed targets")
8272
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")
8677
endif()
87-
mark_as_advanced(CMAKE_INSTALL_CMAKEDIR)
8878
endif()
8979
endif()
9080

0 commit comments

Comments
 (0)