diff options
| author | Sadie Powell <sadie@witchery.services> | 2024-01-09 13:57:32 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2024-01-09 13:57:32 +0000 |
| commit | fc2df00cfcb51d9c5cf3640285e91e7d55c23eff (patch) | |
| tree | eb5baae2ad05646b4f68844ae0d57e9b8ff097e1 | |
| parent | f92c5471c24253128939974327eda7db95ff06ee (diff) | |
Put modules into their own folder on Windows.
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | modules/CMakeLists.txt | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d13480b5..23bbbd4c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,9 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) +# Put modules in their own folder +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + # If we are using a GNU compiler (have to use CXX because it seems to fail on C), we will be able to determine it's default paths for libraries and includes if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang$") # First look for the compiler's default library directories diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 311e9964b..c0736cd84 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -77,7 +77,15 @@ macro(build_modules SRC) else() set(WIN32_NO_LIBS) endif() - set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${TEMP_LDFLAGS} ${WIN32_NO_LIBS}" INSTALL_RPATH_USE_LINK_PATH ON BUILD_WITH_INSTALL_RPATH ON) + set_target_properties(${SO} PROPERTIES + BUILD_WITH_INSTALL_RPATH ON + FOLDER "Modules" + INSTALL_RPATH_USE_LINK_PATH ON + LINKER_LANGUAGE CXX + LINK_FLAGS "${TEMP_LDFLAGS} ${WIN32_NO_LIBS}" + PREFIX "" + SUFFIX "" + ) add_dependencies(${SO} ${PROGRAM_NAME}) if(HAVE_LOCALIZATION) add_dependencies(${SO} module_language) |