Merge branch 'cmake-3.15' into cmake-3.20

scheibel · scheibel · commit a0dac205a214 · 2025-04-11T14:17:34.000+02:00
diff --git a/README.md b/README.md
@@ -125,7 +125,6 @@ include(GenerateExportHeader)
 include(WriteCompilerDetectionHeader)
 ```
 
-
 ### Project Meta Information
 
 The declaration of project-wide information--that are used, e.g., within documentation, testing, and deployment--, is combined within the project meta information section in the main `CMakeLists.txt`.
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,9 +4,9 @@ branches:
   - master
 clone_folder: c:\projects\cmake-init
 image:
-- Visual Studio 2013
 - Visual Studio 2015
 - Visual Studio 2017
+- Visual Studio 2019
 configuration:
 - Release
 - Debug
@@ -22,20 +22,20 @@ matrix:
 # skip unsupported combinations
 init:
 - set arch=
-- if "%arch%"=="Win64" ( set arch= Win64)
+- if "%arch%"=="Win64" ( set arch= x64)
 - echo %arch%
 - echo %APPVEYOR_BUILD_WORKER_IMAGE%
-- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set generator="Visual Studio 15 2017%arch%" )
-- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set generator="Visual Studio 14 2015%arch%" )
-- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" ( set generator="Visual Studio 12 2013%arch%" )
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set generator="Visual Studio 15 2017" )
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set generator="Visual Studio 14 2015" )
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" ( set generator="Visual Studio 16 2019" )
 - echo %generator%
 
 before_build:
 - cmd: |-
     mkdir build
     cd build
     cmake --version
-    cmake .. -G %generator%
+    cmake .. -G %generator%  -A %arch%
 
 build:
   project: c:\projects\cmake-init\build\template.sln
diff --git a/source/baselib/CMakeLists.txt b/source/baselib/CMakeLists.txt
@@ -169,7 +169,7 @@ target_compile_options(${target}
 # Linker options
 # 
 
-target_link_libraries(${target}
+target_link_options(${target}
     PRIVATE
 
     PUBLIC
diff --git a/source/examples/fibcmd/CMakeLists.txt b/source/examples/fibcmd/CMakeLists.txt
@@ -99,7 +99,7 @@ target_compile_options(${target}
 # Linker options
 # 
 
-target_link_libraries(${target}
+target_link_options(${target}
     PRIVATE
     ${DEFAULT_LINKER_OPTIONS}
 )
diff --git a/source/examples/fibgui/CMakeLists.txt b/source/examples/fibgui/CMakeLists.txt
@@ -122,7 +122,7 @@ target_compile_options(${target}
 # Linker options
 # 
 
-target_link_libraries(${target}
+target_link_options(${target}
     PRIVATE
     ${DEFAULT_LINKER_OPTIONS}
 )
diff --git a/source/fiblib/CMakeLists.txt b/source/fiblib/CMakeLists.txt
@@ -171,7 +171,7 @@ target_compile_options(${target}
 # Linker options
 # 
 
-target_link_libraries(${target}
+target_link_options(${target}
     PRIVATE
 
     PUBLIC
diff --git a/source/tests/fiblib-test/CMakeLists.txt b/source/tests/fiblib-test/CMakeLists.txt
@@ -95,7 +95,7 @@ target_compile_options(${target}
 # Linker options
 # 
 
-target_link_libraries(${target}
+target_link_options(${target}
     PRIVATE
     ${DEFAULT_LINKER_OPTIONS}
 )

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ target_compile_options(${target}`
`169`	`169`	`# Linker options`
`170`	`170`	`#`
`171`	`171`
`172`		`-target_link_libraries(${target}`
	`172`	`+target_link_options(${target}`
`173`	`173`	`PRIVATE`
`174`	`174`
`175`	`175`	`PUBLIC`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ target_compile_options(${target}`
`99`	`99`	`# Linker options`
`100`	`100`	`#`
`101`	`101`
`102`		`-target_link_libraries(${target}`
	`102`	`+target_link_options(${target}`
`103`	`103`	`PRIVATE`
`104`	`104`	`${DEFAULT_LINKER_OPTIONS}`
`105`	`105`	`)`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ target_compile_options(${target}`
`122`	`122`	`# Linker options`
`123`	`123`	`#`
`124`	`124`
`125`		`-target_link_libraries(${target}`
	`125`	`+target_link_options(${target}`
`126`	`126`	`PRIVATE`
`127`	`127`	`${DEFAULT_LINKER_OPTIONS}`
`128`	`128`	`)`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ target_compile_options(${target}`
`171`	`171`	`# Linker options`
`172`	`172`	`#`
`173`	`173`
`174`		`-target_link_libraries(${target}`
	`174`	`+target_link_options(${target}`
`175`	`175`	`PRIVATE`
`176`	`176`
`177`	`177`	`PUBLIC`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ target_compile_options(${target}`
`95`	`95`	`# Linker options`
`96`	`96`	`#`
`97`	`97`
`98`		`-target_link_libraries(${target}`
	`98`	`+target_link_options(${target}`
`99`	`99`	`PRIVATE`
`100`	`100`	`${DEFAULT_LINKER_OPTIONS}`
`101`	`101`	`)`