cmake improvements

* reference vclibs64 as a git submodule
* fix warning file names with no extension
* exclude projects that don't build from vs2022 build solution default
* default to NATIVE (instead of ALL) AI to avoid default java dependency
* default startup project engine-legacy (tested with vs2022)
* find package use correct case for names (fix cmake warning)
* more cmake fixes pending in BARb, CircuitAI, tracy (separate git submodule)

Author: pemgithub

.gitmodules

@@ -21,3 +21,6 @@
 [submodule "rts/lib/tracy"]
 	path = rts/lib/tracy
 	url = https://github.com/wolfpld/tracy.git
+[submodule "vclibs64"]
+	path = vclibs64
+	url = https://github.com/beyond-all-reason/vclibs64

AI/Wrappers/LegacyCpp/CMakeLists.txt

@@ -44,16 +44,16 @@ if    (BUILD_${myName}_AIWRAPPER)
 
 	# Assemble the Legacy C++ AI sources
 	set(mySources
-		"${mySourceDir}/AIAI"
-		"${mySourceDir}/AIAICallback"
-		"${mySourceDir}/AIAICheats"
-		"${mySourceDir}/AIGlobalAICallback"
-		"${mySourceDir}/DamageArray"
-		"${mySourceDir}/MoveData"
-		"${mySourceDir}/UnitDef"
-		"${rts}/ExternalAI/AISCommands"
-		"${rts}/Sim/Units/CommandAI/Command"
-		"${rts}/System/float3"
+		"${mySourceDir}/AIAI.cpp"
+		"${mySourceDir}/AIAICallback.cpp"
+		"${mySourceDir}/AIAICheats.cpp"
+		"${mySourceDir}/AIGlobalAICallback.cpp"
+		"${mySourceDir}/DamageArray.cpp"
+		"${mySourceDir}/MoveData.cpp"
+		"${mySourceDir}/UnitDef.cpp"
+		"${rts}/ExternalAI/AISCommands.cpp"
+		"${rts}/Sim/Units/CommandAI/Command.cpp"
+		"${rts}/System/float3.cpp"
 		${ai_common_SRC}
 		)
 

CMakeLists.txt

@@ -18,6 +18,7 @@ option(WITH_MAPCOMPILER "Include map compiler" TRUE)
 # dummy so that qtcreator shows all files (even those of windows)
 if(CMAKE_VERSION VERSION_GREATER 3.1.2)
 	add_library(platform_sources EXCLUDE_FROM_ALL "")
+	set_property(TARGET platform_sources PROPERTY EXCLUDE_FROM_DEFAULT_BUILD_DEBUG TRUE)
 endif()
 
 # includes rts/build/cmake/Util.cmake & rts/build/cmake/PreferStaticLibs.cmake
@@ -184,7 +185,9 @@ endif (UNIX AND NOT MINGW)
 # (next two are relative to CMAKE_INSTALL_PREFIX)
 set(AI_LIBS_DIR "${DATADIR}"     CACHE STRING "Where to install Skirmish AI libraries")
 set(AI_DATA_DIR "${AI_LIBS_DIR}" CACHE STRING "Where to install Skirmish AI additional files (eg. configuration)")
-set(AI_TYPES    "ALL"            CACHE STRING "Which AI Interfaces (and Skirmish AIs using them) to build [ALL|NATIVE|JAVA|NONE]")
+
+# NATIVE to avoid Java dependency by default (to avoid cmake config Could NOT find JNI (missing: JAVA_INCLUDE_PATH JAVA_INCLUDE_PATH2 AWT JVM)
+set(AI_TYPES    "NATIVE"         CACHE STRING "Which AI Interfaces (and Skirmish AIs using them) to build [ALL|NATIVE|JAVA|NONE]")
 
 ## DataDirs
 set(BUILTIN_DATADIRS "")
@@ -657,3 +660,5 @@ if (INSTALL_PORTABLE)
 	file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/springsettings_portable.cfg)  # empty settings file for portable install
 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/springsettings_portable.cfg DESTINATION . RENAME springsettings.cfg)
 endif (INSTALL_PORTABLE)
+
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT engine-legacy)

rts/build/cmake/FindFontConfig.cmake

@@ -21,7 +21,7 @@ Find_Library(FONTCONFIG_LIBRARY NAMES ${FONTCONFIG_NAMES})
 
 # handle the QUIETLY and REQUIRED arguments and set FONTCONFIG_FOUND to TRUE if
 # all listed variables are TRUE
-Find_Package_Handle_Standard_Args(FONTCONFIG DEFAULT_MSG FONTCONFIG_LIBRARY FONTCONFIG_INCLUDE_DIR)
+Find_Package_Handle_Standard_Args(FontConfig DEFAULT_MSG FONTCONFIG_LIBRARY FONTCONFIG_INCLUDE_DIR)
 
 If     (FONTCONFIG_FOUND)
 	Set(FONTCONFIG_LIBRARIES ${FONTCONFIG_LIBRARY})

rts/build/cmake/FindMiniZip.cmake

@@ -21,7 +21,7 @@ Find_Library(MINIZIP_LIBRARY NAMES ${MINIZIP_NAMES})
 
 # handle the QUIETLY and REQUIRED arguments and set MINIZIP_FOUND to TRUE if
 # all listed variables are TRUE
-Find_Package_Handle_Standard_Args(MiniZip DEFAULT_MSG MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR)
+Find_Package_Handle_Standard_Args(minizip DEFAULT_MSG MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR)
 
 If     (MINIZIP_FOUND)
   Set(MINIZIP_LIBRARIES ${MINIZIP_LIBRARY})

rts/builds/dedicated/CMakeLists.txt

@@ -160,14 +160,15 @@ add_executable(engine-dedicated
 		${sources_engine_System_Log_sinkFile}
 		${sources_engine_System_Log_sinkOutputDebugString}
 		${ENGINE_ICON}
-		main
+		main.cpp
 	)
 target_link_libraries(engine-dedicated ${engineDedicatedLibraries})
 if    (MINGW)
 	target_link_libraries(engine-dedicated ${WS2_32_LIBRARY} ${IMAGEHLP_LIBRARY} ${IPHLPAPI_LIBRARY} ${WINMM_LIBRARY})
 endif (MINGW)
 if    (MSVC)
 	target_link_libraries(engine-dedicated ${DBGHELP_LIBRARY})
+	set_property(TARGET engine-dedicated PROPERTY EXCLUDE_FROM_DEFAULT_BUILD_DEBUG TRUE)
 endif (MSVC)
 add_dependencies(engine-dedicated generateVersionFiles)
 

rts/builds/headless/CMakeLists.txt

@@ -36,6 +36,7 @@ include_directories(${ENGINE_SRC_ROOT_DIR}/lib/slimsig/include)
 ### Build the executable
 add_executable(engine-headless ${engineSources} ${ENGINE_ICON})
 target_link_libraries(engine-headless no-sound ${engineHeadlessLibraries} no-sound)
+set_property(TARGET engine-headless PROPERTY EXCLUDE_FROM_DEFAULT_BUILD_DEBUG TRUE)
 
 if    (MINGW)
 	# To enable console output/force a console window to open

rts/builds/legacy/CMakeLists.txt

@@ -4,6 +4,7 @@
 # which makes testing spring in the builddir easier, eg. like this:
 # cd build-dir
 # SPRING_DATADIR=$(pwd) ./spring
+cmake_minimum_required(VERSION 3.6)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 
@@ -82,8 +83,13 @@ include_directories(${engineIncludes})
 add_executable(engine-legacy ${EXE_FLAGS} ${engineSources} ${ENGINE_ICON} ${engineHeaders})
 target_link_libraries(engine-legacy ${engineLibraries})
 
+if (MSVC)
+	add_custom_command(TARGET engine-legacy PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different "${PROJECT_SOURCE_DIR}/vclibs64/dll/" ${PROJECT_BINARY_DIR}/$(Configuration))
+endif (MSVC)
 
 ### Install the executable
 install(TARGETS engine-legacy DESTINATION ${BINDIR})
 
 create_engine_build_and_install_target(legacy)
+
+set_property(TARGET install-spring-legacy PROPERTY EXCLUDE_FROM_DEFAULT_BUILD_DEBUG TRUE)

rts/lib/assimp/CMakeLists.txt

@@ -33,8 +33,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #----------------------------------------------------------------------
-SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED(VERSION 3.26.3)
 PROJECT( Assimp )
 
 # All supported options ###############################################

rts/lib/assimp/code/CMakeLists.txt

@@ -43,7 +43,7 @@
 # 3) Add libassimp using the file lists (eliminates duplication of file names between
 #    source groups and library command)
 #
-cmake_minimum_required( VERSION 2.6 )
+cmake_minimum_required(VERSION 3.26.3)
 SET( HEADER_PATH ../include/assimp )
 
 SET( COMPILER_HEADERS

rts/lib/headlessStubs/CMakeLists.txt

@@ -1,8 +1,8 @@
 SET(headlessStubsSources
-		"glewstub"
-		"glstub"
-		"glustub"
-		"sdlstub"
+		"glewstub.c"
+		"glstub.c"
+		"glustub.c"
+		"sdlstub.c"
 	)
 
 FIND_PACKAGE(SDL2 REQUIRED)

rts/lib/minizip/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Spring supplied CMake build file
 
 set(MINIZIP_FIND_QUIETLY TRUE)
-FIND_PACKAGE_STATIC(MiniZip)
+FIND_PACKAGE_STATIC(minizip)
 
 if     (MINIZIP_FOUND)
 	# Use the system supplied MiniZip library
@@ -13,9 +13,9 @@ else   (MINIZIP_FOUND)
 	# Build our own minizip library
 
 	set(miniZipSources
-			"unzip"
-			"zip"
-			"ioapi"
+			"unzip.c"
+			"zip.c"
+			"ioapi.c"
 		)
 
 	add_definitions(-DNOCRYPT -DNOUNCRYPT)

test/CMakeLists.txt

@@ -68,6 +68,7 @@ macro (add_spring_test target sources libraries flags)
 	target_link_libraries(test_${target} ${libraries} ${test_common_libraries})
 	set_target_properties(test_${target} PROPERTIES COMPILE_FLAGS "${flags}")
 	#install(TARGETS test_${target} DESTINATION ${BINDIR})
+	set_property(TARGET test_${target} PROPERTY EXCLUDE_FROM_DEFAULT_BUILD_DEBUG TRUE)
 endmacro()
 
 ################################################################################
@@ -244,6 +245,7 @@ endif()
 	# positive tests (should compile fine)
 	add_spring_test(${test_name} "${test_src}" "${test_libs}" "")
 	add_dependencies(tests test_BitwiseEnum)
+	set_property(TARGET test_BitwiseEnum PROPERTY EXCLUDE_FROM_DEFAULT_BUILD_DEBUG TRUE)
 
 	# negative tests (must not compile)
 	spring_test_compile_fail(testBitwiseEnum_fail1 ${test_src} "-DTEST1")

tools/DemoTool/CMakeLists.txt

@@ -37,7 +37,7 @@ set(demoToolSpringSources
 	${ENGINE_SRC_ROOT_DIR}/System/SafeCStrings.c
 )
 
-add_executable(demotool EXCLUDE_FROM_ALL DemoTool ${demoToolSpringSources})
+add_executable(demotool EXCLUDE_FROM_ALL DemoTool.cpp ${demoToolSpringSources})
 if (MINGW)
 	# To enable console output/force a console window to open
 	set_target_properties(demotool PROPERTIES LINK_FLAGS "-Wl,-subsystem,console")
@@ -48,3 +48,4 @@ target_link_libraries(demotool
 		gflags
 	)
 add_dependencies(demotool generateVersionFiles)
+set_property(TARGET demotool PROPERTY EXCLUDE_FROM_DEFAULT_BUILD_DEBUG TRUE)

tools/dirchange/CMakeLists.txt

@@ -7,5 +7,5 @@
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 
-add_executable(dirchange EXCLUDE_FROM_ALL dirchange)
+add_executable(dirchange EXCLUDE_FROM_ALL dirchange.cpp)
 set_target_properties(dirchange PROPERTIES OUTPUT_NAME "dch")

tools/unitsync/test/CMakeLists.txt

@@ -19,3 +19,4 @@ add_executable(unitsyncTest EXCLUDE_FROM_ALL test.cpp)
 target_link_libraries(unitsyncTest unitsync ${CMAKE_DL_LIBS})
 add_dependencies(unitsyncTest unitsync)
 #INSTALL(TARGETS unitsyncTest DESTINATION ${BINDIR})
+set_property(TARGET unitsyncTest PROPERTY EXCLUDE_FROM_DEFAULT_BUILD_DEBUG TRUE)