diff options
| -rw-r--r-- | Help/guide/tutorial/Installing and Testing.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/CONFIG_POSTFIX.rst | 10 | ||||
| -rw-r--r-- | Modules/ExternalProject.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindGLUT.cmake | 8 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 3 |
7 files changed, 18 insertions, 15 deletions
diff --git a/Help/guide/tutorial/Installing and Testing.rst b/Help/guide/tutorial/Installing and Testing.rst index fa13040..c020264 100644 --- a/Help/guide/tutorial/Installing and Testing.rst +++ b/Help/guide/tutorial/Installing and Testing.rst @@ -145,7 +145,7 @@ are similar. To the end of the top-level ``CMakeLists.txt`` we add: :name: TODO 3,4: CMakeLists.txt-install-TARGETS :language: cmake :start-after: # add the install targets - :end-before: # enable testing + :end-before: # TODO 1: Replace enable_testing() with include(CTest) .. raw:: html diff --git a/Help/prop_tgt/CONFIG_POSTFIX.rst b/Help/prop_tgt/CONFIG_POSTFIX.rst index 5c2fbd7..69caa39 100644 --- a/Help/prop_tgt/CONFIG_POSTFIX.rst +++ b/Help/prop_tgt/CONFIG_POSTFIX.rst @@ -1,13 +1,13 @@ <CONFIG>_POSTFIX ---------------- -Postfix to append to the target file name for configuration <CONFIG>. +Postfix to append to the target file name for configuration ``<CONFIG>``. -When building with configuration <CONFIG> the value of this property +When building with configuration ``<CONFIG>`` the value of this property is appended to the target file name built on disk. For non-executable -targets, this property is initialized by the value of the variable -CMAKE_<CONFIG>_POSTFIX if it is set when a target is created. This -property is ignored on the Mac for Frameworks and App Bundles. +targets, this property is initialized by the value of the +:variable:`CMAKE_<CONFIG>_POSTFIX` variable if it is set when a target is +created. This property is ignored on macOS for Frameworks and App Bundles. For macOS see also the :prop_tgt:`FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>` target property. diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 22a25bd..141b185 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -3642,7 +3642,7 @@ function(_ep_extract_configure_command var name) ) endif() - list(APPEND cmd "<SOURCE_DIR><SOURCE_SUBDIR>") + list(APPEND cmd -S "<SOURCE_DIR><SOURCE_SUBDIR>" -B "<BINARY_DIR>") endif() set("${var}" "${cmd}" PARENT_SCOPE) diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index e0636b2..09403bc 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -68,9 +68,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package(PkgConfig QUIET) -pkg_check_modules(PC_GLUT QUIET glut) -if(NOT PC_GLUT_FOUND) - pkg_check_modules(PC_GLUT QUIET freeglut) +if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_GLUT QUIET glut) + if(NOT PC_GLUT_FOUND) + pkg_check_modules(PC_GLUT QUIET freeglut) + endif() endif() if(WIN32) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d08660a..fa9b2b5 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 25) -set(CMake_VERSION_PATCH 20221027) +set(CMake_VERSION_PATCH 20221028) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 98dea3a..6cba943 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2915,8 +2915,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt, } // Create the INSTALL_PATH attribute. + std::string install_name_dir; if (gtgt->GetType() == cmStateEnums::SHARED_LIBRARY) { - std::string install_name_dir; // Get the install_name directory for the build tree. install_name_dir = gtgt->GetInstallNameDirForBuildTree(configName); // Xcode doesn't create the correct install_name in some cases. @@ -2938,9 +2938,9 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt, extraLinkOptions += " -install_name "; extraLinkOptions += XCodeEscapePath(install_name); } - buildSettings->AddAttribute("INSTALL_PATH", - this->CreateString(install_name_dir)); } + buildSettings->AddAttribute("INSTALL_PATH", + this->CreateString(install_name_dir)); // Create the LD_RUNPATH_SEARCH_PATHS cmComputeLinkInformation* pcli = gtgt->GetLinkInformation(configName); diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index c09eefa..4cfb561 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -903,7 +903,6 @@ void cmVisualStudio10TargetGenerator::WriteSdkStyleProjectFile( // of the IDE. e1.Element("VCProjectUpgraderObjectName", "NoUpgrade"); e1.Element("ManagedAssembly", "true"); - e1.Element("AppendTargetFrameworkToOutputPath", "false"); cmValue targetFramework = this->GeneratorTarget->GetProperty("DOTNET_TARGET_FRAMEWORK"); @@ -912,9 +911,11 @@ void cmVisualStudio10TargetGenerator::WriteSdkStyleProjectFile( e1.Element("TargetFrameworks", *targetFramework); } else { e1.Element("TargetFramework", *targetFramework); + e1.Element("AppendTargetFrameworkToOutputPath", "false"); } } else { e1.Element("TargetFramework", "net5.0"); + e1.Element("AppendTargetFrameworkToOutputPath", "false"); } std::string outputType; |