CMake renamed for Linux

stuntrally · Nov 15, 2024 · 3150997 · 3150997
1 parent af23dff
commit 3150997
Show file tree

Hide file tree

Showing 42 changed files with 772 additions and 772 deletions.
diff --git a/CMakeManual/Boost.cmake → CMake/Boost.cmake b/CMakeManual/Boost.cmake → CMake/Boost.cmake
diff --git a/CMake/Bootstrap.cmake b/CMake/Bootstrap.cmake
@@ -1,52 +1,52 @@
 
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG" )
 
-if (NOT APPLE)
-    if (CMAKE_BUILD_TYPE STREQUAL "")
-        set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "One of: Debug Release RelWithDebInfo MinSizeRel." FORCE)
-    endif ()
-else ()
-    set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.ogre3d.\${PRODUCT_NAME:rfc1034identifier}")
-endif ()
+if( NOT APPLE )
+	if( CMAKE_BUILD_TYPE STREQUAL "" )
+		set( CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "One of: Debug Release RelWithDebInfo MinSizeRel." FORCE )
+	endif()
+else()
+	set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.ogre3d.\${PRODUCT_NAME:rfc1034identifier}")
+endif()
 
-if (NOT MSVC)
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}			-DDEBUG=1 -D_DEBUG=1 -g")
-    set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}		-Os -DNDEBUG")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}			-O2 -DNDEBUG")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}	-O2 -g")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual")
-    #set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-overloaded-virtual" )
-endif ()
+if( NOT MSVC )
+	set( CMAKE_CXX_FLAGS_DEBUG			"${CMAKE_CXX_FLAGS_DEBUG}			-DDEBUG=1 -D_DEBUG=1 -g"	)
+	set( CMAKE_CXX_FLAGS_MINSIZEREL		"${CMAKE_CXX_FLAGS_MINSIZEREL}		-Os -DNDEBUG"				)
+	set( CMAKE_CXX_FLAGS_RELEASE		"${CMAKE_CXX_FLAGS_RELEASE}			-O2 -DNDEBUG"				)
+	set( CMAKE_CXX_FLAGS_RELWITHDEBINFO	"${CMAKE_CXX_FLAGS_RELWITHDEBINFO}	-O2 -g"						)
+	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual" )
+	#set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-overloaded-virtual" )
+endif()
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}			-fno-limit-debug-info")
-endif ()
+if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+	set( CMAKE_CXX_FLAGS_DEBUG		"${CMAKE_CXX_FLAGS_DEBUG}			-fno-limit-debug-info"		)
+endif()
 
 # Determine if we are compiling for a 32bit or 64bit system
-if (NOT APPLE)
-    include(CheckTypeSize)
-    CHECK_TYPE_SIZE("void*" ARCH_PTR_SIZE BUILTIN_TYPES_ONLY)
-    if (ARCH_PTR_SIZE EQUAL 8)
-        set(PLATFORM_X64 TRUE)
-    else ()
-        set(PLATFORM_X64 FALSE)
-    endif ()
-endif ()
+if( NOT APPLE )
+	include(CheckTypeSize)
+	CHECK_TYPE_SIZE("void*" ARCH_PTR_SIZE BUILTIN_TYPES_ONLY)
+	if (ARCH_PTR_SIZE EQUAL 8)
+	  set(PLATFORM_X64 TRUE)
+	else ()
+	  set(PLATFORM_X64 FALSE)
+	endif ()
+endif()
 
-if (MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-    if (NOT PLATFORM_X64)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
-    endif ()
-    add_definitions(-DUNICODE -D_UNICODE)
-endif ()
+if( MSVC )
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+	if( NOT PLATFORM_X64 )
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
+	endif()
+	add_definitions( -DUNICODE -D_UNICODE )
+endif()
 
-if (APPLE)
-    macro(add_recursive dir retVal)
-        file(GLOB_RECURSE ${retVal} ${dir}/*.h ${dir}/*.cpp ${dir}/*.c ${dir}/*.mm ${dir}/*.m)
-    endmacro()
-else ()
-    macro(add_recursive dir retVal)
-        file(GLOB_RECURSE ${retVal} ${dir}/*.h ${dir}/*.cpp ${dir}/*.c)
-    endmacro()
-endif ()
+if( APPLE )
+	macro( add_recursive dir retVal )
+		file( GLOB_RECURSE ${retVal} ${dir}/*.h ${dir}/*.cpp ${dir}/*.c ${dir}/*.mm ${dir}/*.m )
+	endmacro()
+else()
+	macro( add_recursive dir retVal )
+		file( GLOB_RECURSE ${retVal} ${dir}/*.h ${dir}/*.cpp ${dir}/*.c )
+	endmacro()
+endif()
diff --git a/CMakeManual/Dependencies/OGRE.cmake → CMake/Dependencies/OGRE.cmake b/CMakeManual/Dependencies/OGRE.cmake → CMake/Dependencies/OGRE.cmake
diff --git a/CMake/DependenciesConfig.cmake b/CMake/DependenciesConfig.cmake
@@ -1,17 +1,114 @@
-set(CMAKE_THREAD_PREFER_PTHREAD YES)
+include(DependenciesFunctions)
 
+set(CMAKE_THREAD_PREFER_PTHREAD YES)
 find_package(Threads REQUIRED)
 
-find_package(Boost REQUIRED)
-find_package(Bullet REQUIRED)
-find_package(enet REQUIRED)
-find_package(MyGUI REQUIRED)
-find_package(Ogg REQUIRED)
-find_package(OGRE REQUIRED)
-find_package(OpenAL REQUIRED)
-find_package(RapidJSON REQUIRED)
-find_package(SDL2 REQUIRED)
-find_package(tinyxml2 REQUIRED)
-find_package(Vorbis REQUIRED)
-
-include(AddMissingTargets)
+# Some pkg-config files are broken, that is why they are commented out
+
+#  fails
+#add_external_lib(
+#        Boost
+#        boost/1.81.0
+#        REQUIRED
+#        FIND_PACKAGE_OPTIONS COMPONENTS system thread
+#)
+
+#add_external_lib(
+#        OGRE
+#        ogre3d/13.4.4@anotherfoxguy/stable
+#        REQUIRED
+#        CONAN_PKG_NAME OGRE
+#        CONAN_OPTIONS ogre3d:nodeless_positioning=True ogre3d:resourcemanager_strict=off
+#        #  uncomment below for Ogre 1.9
+#        #PKG_CONFIG "OGRE, OGRE-Terrain, OGRE-Paging, OGRE-Overlay"        
+#        FIND_PACKAGE_OPTIONS CONFIG COMPONENTS Bites Overlay Paging RTShaderSystem MeshLodGenerator Terrain
+#)
+
+add_external_lib(
+        BULLET
+        bullet3/3.24
+        REQUIRED
+        FIND_PACKAGE
+        CONAN_OPTIONS bullet3:extras=True bullet3:network_support=True
+        INTERFACE_NAME Bullet::Bullet
+)
+
+#add_external_lib(
+#        SDL2
+#        sdl/2.0.20
+#        REQUIRED
+#        PKG_CONFIG "sdl2 >= 2.0"
+#        FIND_PACKAGE_OPTIONS CONFIG
+#        CONAN_OPTIONS sdl:sdl2main=False
+#)
+
+#add_external_lib(
+#        MyGUI
+#        mygui/3.4.1@anotherfoxguy/stable
+#        REQUIRED
+#        # PKG_CONFIG "MYGUI = 3.4.0"
+#        FIND_PACKAGE
+#)
+
+add_external_lib(
+        OGG
+        ogg/1.3.5
+        REQUIRED
+        PKG_CONFIG "ogg >= 1.2"
+        FIND_PACKAGE
+)
+
+add_external_lib(
+        VorbisFile
+        vorbis/1.3.7
+        REQUIRED
+        PKG_CONFIG "vorbis >= 1.2, vorbisfile >= 1.2"
+        FIND_PACKAGE
+)
+
+#  todo: fix  Cannot load recipe.
+#add_external_lib(
+#        OpenAL
+#        openal/1.22.2
+#        REQUIRED
+#        PKG_CONFIG "openal >= 1.18"
+#        FIND_PACKAGE_OPTIONS CONFIG
+#)
+
+#add_external_lib(
+#        ENet
+#        enet/1.3.17
+#        REQUIRED
+#        PKG_CONFIG "libenet >= 1.2"
+#        FIND_PACKAGE
+#)
+
+add_external_lib(
+        tinyxml2
+        tinyxml2/9.0.0
+        REQUIRED
+        PKG_CONFIG "tinyxml2 >= 6"
+        FIND_PACKAGE
+)
+
+
+set(LIBS
+        #Boost::Boost  #  fails
+        #Threads::Threads
+        #OGRE::OGRE
+        #- Bullet::Bullet  // fixme?
+        #SDL2::SDL2
+        #MyGUI::MyGUI
+        VorbisFile::VorbisFile
+        OGG::OGG
+        #OpenAL::OpenAL  #  fails
+        #ENet::ENet  #  fails
+        tinyxml2::tinyxml2
+)
+
+#set(SERVER_LIBS Boost::Boost ENet::ENet)
+
+
+find_package( ENet REQUIRED )
+
+find_package( Boost COMPONENTS system thread REQUIRED )
diff --git a/CMakeManual/DependenciesFunctions.cmake → CMake/DependenciesFunctions.cmake b/CMakeManual/DependenciesFunctions.cmake → CMake/DependenciesFunctions.cmake
diff --git a/CMakeManual/FindBULLET.cmake → CMake/FindBULLET.cmake b/CMakeManual/FindBULLET.cmake → CMake/FindBULLET.cmake
diff --git a/CMakeManual/FindENet.cmake → CMake/FindENet.cmake b/CMakeManual/FindENet.cmake → CMake/FindENet.cmake
diff --git a/CMake/FindMyGUI.cmake b/CMake/FindMyGUI.cmake
@@ -40,11 +40,11 @@ find_path(MyGUI_INCLUDE_DIR MyGUI.h PATH_SUFFIXES MYGUI)
 
 # Find release libraries
 find_library(MyGUI_MyGUIEngine_LIBRARY_REL MyGUIEngine PATH_SUFFIXES release relwithdebinfo minsizerel)
-find_library(MyGUI_OgrePlatform_LIBRARY_REL MyGUI.Ogre2Platform PATH_SUFFIXES release relwithdebinfo minsizerel)
+find_library(MyGUI_OgrePlatform_LIBRARY_REL MyGUI.OgrePlatform PATH_SUFFIXES release relwithdebinfo minsizerel)
 
 # Find debug libraries
 find_library(MyGUI_MyGUIEngine_LIBRARY_DBG NAMES MyGUIEngine_d MyGUIEngine PATH_SUFFIXES debug)
-find_library(MyGUI_OgrePlatform_LIBRARY_DBG NAMES MyGUIOgre2Platform_d MyGUI.Ogre2Platform PATH_SUFFIXES debug)
+find_library(MyGUI_OgrePlatform_LIBRARY_DBG NAMES MyGUI.OgrePlatform_d MyGUI.OgrePlatform PATH_SUFFIXES debug)
 
 # set include directories and libraries
 set(MyGUI_INCLUDE_DIRS ${MyGUI_INCLUDE_DIR})

diff --git a/CMakeManual/FindOGG.cmake → CMake/FindOGG.cmake b/CMakeManual/FindOGG.cmake → CMake/FindOGG.cmake
diff --git a/CMakeManual/FindRapidjson.cmake → CMake/FindRapidjson.cmake b/CMakeManual/FindRapidjson.cmake → CMake/FindRapidjson.cmake
diff --git a/CMake/Macros.cmake b/CMake/Macros.cmake
@@ -200,37 +200,3 @@ function(cmd_option name desc)
 
     set(${name} "${${name}}" PARENT_SCOPE)
 endfunction()
-
-# Helper to retrieve the settings returned from pkg_check_modules()
-macro(get_package_interface package)
-    set(INCLUDES ${${package}_INCLUDE_DIRS})
-
-    set(LINKDIRS ${${package}_LIBDIR})
-
-    # We resolve the full path of each library to ensure the
-    # correct one is referenced while linking
-    foreach (lib ${${package}_LIBRARIES})
-        find_library(LIB_${lib} ${lib} HINTS ${LINKDIRS})
-        list(APPEND LIBRARIES ${LIB_${lib}})
-    endforeach ()
-endmacro()
-
-macro(find_with_pkg package interface_name PKG_CONFIG)
-    pkg_check_modules(${package} ${PKG_CONFIG})
-
-    if (${package}_FOUND)
-        message(STATUS "Using '${package}' system library (Found by pkg_config)")
-
-        # Create the target interface library
-        add_library(${interface_name} INTERFACE IMPORTED GLOBAL)
-
-        # Retrieve the package information
-        get_package_interface(${package})
-
-        # And add it to our target
-        target_include_directories(${interface_name} INTERFACE ${INCLUDES})
-        target_link_libraries(${interface_name} INTERFACE ${LIBRARIES})
-
-        message(STATUS "Added inteface ${interface_name} ${INCLUDES} ${LIBRARIES}")
-    endif ()
-endmacro()
diff --git a/CMakeManual/OgreConfigTargets.cmake → CMake/OgreConfigTargets.cmake b/CMakeManual/OgreConfigTargets.cmake → CMake/OgreConfigTargets.cmake
diff --git a/CMakeManual/OgreFindFrameworks.cmake → CMake/OgreFindFrameworks.cmake b/CMakeManual/OgreFindFrameworks.cmake → CMake/OgreFindFrameworks.cmake
diff --git a/CMakeManual/OgreGetVersion.cmake → CMake/OgreGetVersion.cmake b/CMakeManual/OgreGetVersion.cmake → CMake/OgreGetVersion.cmake
diff --git a/CMakeManual/conan.cmake → CMake/conan.cmake b/CMakeManual/conan.cmake → CMake/conan.cmake
diff --git a/CMakeManual/dependencies-helpers/Boost.cmake → CMake/dependencies-helpers/Boost.cmake b/CMakeManual/dependencies-helpers/Boost.cmake → CMake/dependencies-helpers/Boost.cmake
diff --git a/...eManual/dependencies-helpers/OpenAL.cmake → CMake/dependencies-helpers/OpenAL.cmake b/...eManual/dependencies-helpers/OpenAL.cmake → CMake/dependencies-helpers/OpenAL.cmake
diff --git a/CMake/AddMissingTargets.cmake → CMakeCI/AddMissingTargets.cmake b/CMake/AddMissingTargets.cmake → CMakeCI/AddMissingTargets.cmake
diff --git a/CMakeCI/Bootstrap.cmake b/CMakeCI/Bootstrap.cmake
@@ -0,0 +1,52 @@
+
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+
+if (NOT APPLE)
+    if (CMAKE_BUILD_TYPE STREQUAL "")
+        set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "One of: Debug Release RelWithDebInfo MinSizeRel." FORCE)
+    endif ()
+else ()
+    set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.ogre3d.\${PRODUCT_NAME:rfc1034identifier}")
+endif ()
+
+if (NOT MSVC)
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}			-DDEBUG=1 -D_DEBUG=1 -g")
+    set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}		-Os -DNDEBUG")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}			-O2 -DNDEBUG")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}	-O2 -g")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual")
+    #set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-overloaded-virtual" )
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}			-fno-limit-debug-info")
+endif ()
+
+# Determine if we are compiling for a 32bit or 64bit system
+if (NOT APPLE)
+    include(CheckTypeSize)
+    CHECK_TYPE_SIZE("void*" ARCH_PTR_SIZE BUILTIN_TYPES_ONLY)
+    if (ARCH_PTR_SIZE EQUAL 8)
+        set(PLATFORM_X64 TRUE)
+    else ()
+        set(PLATFORM_X64 FALSE)
+    endif ()
+endif ()
+
+if (MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+    if (NOT PLATFORM_X64)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
+    endif ()
+    add_definitions(-DUNICODE -D_UNICODE)
+endif ()
+
+if (APPLE)
+    macro(add_recursive dir retVal)
+        file(GLOB_RECURSE ${retVal} ${dir}/*.h ${dir}/*.cpp ${dir}/*.c ${dir}/*.mm ${dir}/*.m)
+    endmacro()
+else ()
+    macro(add_recursive dir retVal)
+        file(GLOB_RECURSE ${retVal} ${dir}/*.h ${dir}/*.cpp ${dir}/*.c)
+    endmacro()
+endif ()
diff --git a/CMakeManual/CheckBulletPrecision.cmake → CMakeCI/CheckBulletPrecision.cmake b/CMakeManual/CheckBulletPrecision.cmake → CMakeCI/CheckBulletPrecision.cmake
diff --git a/CMakeCI/DependenciesConfig.cmake b/CMakeCI/DependenciesConfig.cmake
@@ -0,0 +1,17 @@
+set(CMAKE_THREAD_PREFER_PTHREAD YES)
+
+find_package(Threads REQUIRED)
+
+find_package(Boost REQUIRED)
+find_package(Bullet REQUIRED)
+find_package(enet REQUIRED)
+find_package(MyGUI REQUIRED)
+find_package(Ogg REQUIRED)
+find_package(OGRE REQUIRED)
+find_package(OpenAL REQUIRED)
+find_package(RapidJSON REQUIRED)
+find_package(SDL2 REQUIRED)
+find_package(tinyxml2 REQUIRED)
+find_package(Vorbis REQUIRED)
+
+include(AddMissingTargets)
diff --git a/CMake/FindBullet.cmake → CMakeCI/FindBullet.cmake b/CMake/FindBullet.cmake → CMakeCI/FindBullet.cmake
diff --git a/CMakeManual/FindMyGUI.cmake → CMakeCI/FindMyGUI.cmake b/CMakeManual/FindMyGUI.cmake → CMakeCI/FindMyGUI.cmake
@@ -40,11 +40,11 @@ find_path(MyGUI_INCLUDE_DIR MyGUI.h PATH_SUFFIXES MYGUI)
 
 # Find release libraries
 find_library(MyGUI_MyGUIEngine_LIBRARY_REL MyGUIEngine PATH_SUFFIXES release relwithdebinfo minsizerel)
-find_library(MyGUI_OgrePlatform_LIBRARY_REL MyGUI.OgrePlatform PATH_SUFFIXES release relwithdebinfo minsizerel)
+find_library(MyGUI_OgrePlatform_LIBRARY_REL MyGUI.Ogre2Platform PATH_SUFFIXES release relwithdebinfo minsizerel)
 
 # Find debug libraries
 find_library(MyGUI_MyGUIEngine_LIBRARY_DBG NAMES MyGUIEngine_d MyGUIEngine PATH_SUFFIXES debug)
-find_library(MyGUI_OgrePlatform_LIBRARY_DBG NAMES MyGUI.OgrePlatform_d MyGUI.OgrePlatform PATH_SUFFIXES debug)
+find_library(MyGUI_OgrePlatform_LIBRARY_DBG NAMES MyGUIOgre2Platform_d MyGUI.Ogre2Platform PATH_SUFFIXES debug)
 
 # set include directories and libraries
 set(MyGUI_INCLUDE_DIRS ${MyGUI_INCLUDE_DIR})

diff --git a/CMake/FindOgg.cmake → CMakeCI/FindOgg.cmake b/CMake/FindOgg.cmake → CMakeCI/FindOgg.cmake
diff --git a/CMakeManual/FindOpenAL.cmake → CMakeCI/FindOpenAL.cmake b/CMakeManual/FindOpenAL.cmake → CMakeCI/FindOpenAL.cmake
diff --git a/...anual/FindPackageHandleStandardArgs.cmake → CMakeCI/FindPackageHandleStandardArgs.cmake b/...anual/FindPackageHandleStandardArgs.cmake → CMakeCI/FindPackageHandleStandardArgs.cmake
diff --git a/CMakeManual/FindPkgMacros.cmake → CMakeCI/FindPkgMacros.cmake b/CMakeManual/FindPkgMacros.cmake → CMakeCI/FindPkgMacros.cmake
diff --git a/CMakeManual/FindSDL2.cmake → CMakeCI/FindSDL2.cmake b/CMakeManual/FindSDL2.cmake → CMakeCI/FindSDL2.cmake
diff --git a/CMakeManual/FindTinyxml2.cmake → CMakeCI/FindTinyxml2.cmake b/CMakeManual/FindTinyxml2.cmake → CMakeCI/FindTinyxml2.cmake
diff --git a/CMakeManual/FindVorbis.cmake → CMakeCI/FindVorbis.cmake b/CMakeManual/FindVorbis.cmake → CMakeCI/FindVorbis.cmake
diff --git a/CMake/Findenet.cmake → CMakeCI/Findenet.cmake b/CMake/Findenet.cmake → CMakeCI/Findenet.cmake
diff --git a/CMake/FixupBundle.cmake → CMakeCI/FixupBundle.cmake b/CMake/FixupBundle.cmake → CMakeCI/FixupBundle.cmake