From be28b80c6370e33067d0535870c7613eba091379 Mon Sep 17 00:00:00 2001 From: realweezerfan93 <22036195+rwf93@users.noreply.github.com> Date: Thu, 22 Jun 2023 09:17:04 -0700 Subject: [PATCH] lowercase all cmake files Adhere to CMake standards --- attic/authentication/CMakeLists.txt | 10 +- attic/authserver/CMakeLists.txt | 14 +- attic/steam/CMakeLists.txt | 10 +- attic/streamingvideo/CMakeLists.txt | 10 +- source/CMakeLists.txt | 688 ++++++++++++++-------------- source/application/CMakeLists.txt | 26 +- source/base/CMakeLists.txt | 10 +- source/client/CMakeLists.txt | 20 +- source/core/CMakeLists.txt | 20 +- source/extern/CMakeLists.txt | 8 +- source/frontend/CMakeLists.txt | 8 +- source/game/CMakeLists.txt | 8 +- source/json_tool/CMakeLists.txt | 20 +- source/mod_uploader/CMakeLists.txt | 24 +- source/platform/CMakeLists.txt | 4 +- source/rendering/CMakeLists.txt | 8 +- source/server/CMakeLists.txt | 10 +- source/test/CMakeLists.txt | 20 +- source/utility/CMakeLists.txt | 58 +-- source/windowing/CMakeLists.txt | 8 +- 20 files changed, 492 insertions(+), 492 deletions(-) diff --git a/attic/authentication/CMakeLists.txt b/attic/authentication/CMakeLists.txt index 45c345b..b65e236 100644 --- a/attic/authentication/CMakeLists.txt +++ b/attic/authentication/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_CORE_INCLUDES} ${STAR_AUTHENTICATION_INCLUDES} ) -SET (authentication_HEADERS +set(authentication_HEADERS StarAuthenticationDatabaseFacade.hpp StarAuthenticationKey.hpp StarAuthenticationService.hpp @@ -12,7 +12,7 @@ SET (authentication_HEADERS StarServerAuthentication.hpp ) -SET (authentication_SOURCES +set(authentication_SOURCES StarAuthenticationKey.cpp StarAuthenticationService.cpp StarAuthenticationConnection.cpp @@ -20,5 +20,5 @@ SET (authentication_SOURCES StarServerAuthentication.cpp ) -ADD_LIBRARY (star_authentication ${authentication_SOURCES} ${authentication_HEADERS}) -TARGET_LINK_LIBRARIES (star_authentication star) +add_library(star_authentication ${authentication_SOURCES} ${authentication_HEADERS}) +target_link_libraries(star_authentication star) diff --git a/attic/authserver/CMakeLists.txt b/attic/authserver/CMakeLists.txt index 87df24e..6cee162 100644 --- a/attic/authserver/CMakeLists.txt +++ b/attic/authserver/CMakeLists.txt @@ -1,23 +1,23 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_CORE_INCLUDES} ${STAR_GAME_INCLUDES} ${STAR_AUTHENTICATION_INCLUDES} ) -SET (authentication_server_HEADERS +set(authentication_server_HEADERS StarAuthenticationDatabase.hpp StarAuthenticationServer.hpp StarDatabaseConnector.hpp ) -SET (authentication_server_SOURCES +set(authentication_server_SOURCES StarAuthenticationDatabase.cpp StarAuthenticationServer.cpp StarDatabaseConnector.cpp ) -ADD_EXECUTABLE (starbound_auth_keygen keygen.cpp ${authentication_server_SOURCES} ${authentication_server_HEADERS}) -ADD_EXECUTABLE (starbound_auth main.cpp ${authentication_server_SOURCES} ${authentication_server_HEADERS}) +add_executable(starbound_auth_keygen keygen.cpp ${authentication_server_SOURCES} ${authentication_server_HEADERS}) +add_executable(starbound_auth main.cpp ${authentication_server_SOURCES} ${authentication_server_HEADERS}) -TARGET_LINK_LIBRARIES (starbound_auth_keygen star_authentication ${PQ_LIBRARY}) -TARGET_LINK_LIBRARIES (starbound_auth star_authentication ${PQ_LIBRARY}) +target_link_libraries(starbound_auth_keygen star_authentication ${PQ_LIBRARY}) +target_link_libraries(starbound_auth star_authentication ${PQ_LIBRARY}) diff --git a/attic/steam/CMakeLists.txt b/attic/steam/CMakeLists.txt index ca6f2cf..3f00b8c 100644 --- a/attic/steam/CMakeLists.txt +++ b/attic/steam/CMakeLists.txt @@ -1,15 +1,15 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_CORE_INCLUDES} ${STAR_STEAM_INCLUDES} ) -SET (steam_HEADERS +set(steam_HEADERS StarSteamCheck.hpp ) -SET (steam_SOURCES +set(steam_SOURCES StarSteamCheck.cpp ) -ADD_LIBRARY (star_steam ${steam_SOURCES} ${steam_HEADERS}) -TARGET_LINK_LIBRARIES (star_steam star) +add_library(star_steam ${steam_SOURCES} ${steam_HEADERS}) +target_link_libraries(star_steam star) diff --git a/attic/streamingvideo/CMakeLists.txt b/attic/streamingvideo/CMakeLists.txt index 91e82ba..88a881e 100644 --- a/attic/streamingvideo/CMakeLists.txt +++ b/attic/streamingvideo/CMakeLists.txt @@ -1,18 +1,18 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_CORE_INCLUDES} ${STAR_STREAMINGVIDEO_INCLUDES} ${STAR_STREAMINGVIDEO_INCLUDES}/twitch ) -SET (streamingvideo_HEADERS +set(streamingvideo_HEADERS StarStreamingVideoController.hpp StarTwitchStreamingVideoController.hpp ) -SET (streamingvideo_SOURCES +set(streamingvideo_SOURCES StarStreamingVideoController.cpp StarTwitchStreamingVideoController.cpp ) -ADD_LIBRARY (star_streamingvideo ${streamingvideo_SOURCES} ${streamingvideo_HEADERS}) -TARGET_LINK_LIBRARIES (star_streamingvideo star) +add_library(star_streamingvideo ${streamingvideo_SOURCES} ${streamingvideo_HEADERS}) +target_link_libraries(star_streamingvideo star) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 7aee822..6f4b73d 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,282 +1,282 @@ -PROJECT (starbound) +project(starbound) -CMAKE_MINIMUM_REQUIRED (VERSION 3.25.1) -SET (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake) +cmake_minimum_required(VERSION 3.25.1) +set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake) -SET (CMAKE_CONFIGURATION_TYPES Debug RelWithAsserts RelWithDebInfo Release) -SET (CMAKE_EXE_LINKER_FLAGS_RELWITHASSERTS "" CACHE STRING "" FORCE) +set(CMAKE_CONFIGURATION_TYPES Debug RelWithAsserts RelWithDebInfo Release) +set(CMAKE_EXE_LINKER_FLAGS_RELWITHASSERTS "" CACHE STRING "" FORCE) # Update the docstring on CMAKE_BUILD_TYPE to show what options we actually # allow -SET (CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "Choose the type of build, options are: Debug RelWithAsserts RelWithDebInfo Release" FORCE) +set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "Choose the type of build, options are: Debug RelWithAsserts RelWithDebInfo Release" FORCE) # Discover all the relevant environment / system information and place the # result in STAR_* cmake variables. # STAR_SOURCE_IDENTIFIER may be set to any string value -IF (NOT DEFINED STAR_SOURCE_IDENTIFIER) - INCLUDE (GetGitRevisionDescription) - GET_GIT_HEAD_REVISION (STAR_GIT_REFSPEC STAR_GIT_HASHVAR) - SET (STAR_SOURCE_IDENTIFIER "${STAR_GIT_HASHVAR}") -ENDIF () +if(NOT DEFINED STAR_SOURCE_IDENTIFIER) + include(GetGitRevisionDescription) + get_git_head_revision(STAR_GIT_REFSPEC STAR_GIT_HASHVAR) + set(STAR_SOURCE_IDENTIFIER "${STAR_GIT_HASHVAR}") +endif() # Architecture identifier, like i386, x86_64 or ppc -IF (NOT DEFINED STAR_ARCHITECTURE) - INCLUDE (TargetArch) - TARGET_ARCHITECTURE (STAR_ARCHITECTURE) -ENDIF () +if(NOT DEFINED STAR_ARCHITECTURE) + include(TargetArch) + target_architecture(STAR_ARCHITECTURE) +endif() # Either TRUE or FALSE -IF (NOT DEFINED STAR_LITTLE_ENDIAN) - INCLUDE (TestBigEndian) - TEST_BIG_ENDIAN (BIGENDIAN) - IF (NOT BIGENDIAN) - SET (STAR_LITTLE_ENDIAN TRUE) - ELSE () - SET (STAR_LITTLE_ENDIAN FALSE) - ENDIF () -ENDIF () - -# System name, like windows, macos, linux, freebsd, or (generic) unix -IF (NOT DEFINED STAR_SYSTEM) - IF (WIN32) - SET (STAR_SYSTEM "windows") - ELSEIF (APPLE AND ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - SET (STAR_SYSTEM "macos") - ELSEIF (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - SET (STAR_SYSTEM "linux") - ELSEIF (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") - SET (STAR_SYSTEM "freebsd") - ELSEIF (UNIX) - SET (STAR_SYSTEM "unix") - ELSE () - SET (STAR_SYSTEM "unknown") - ENDIF () -ENDIF () - -IF (NOT DEFINED STAR_SYSTEM_FAMILY) - IF (WIN32) - SET (STAR_SYSTEM_FAMILY "windows") - ELSEIF (UNIX) - SET (STAR_SYSTEM_FAMILY "unix") - ELSE () - SET (STAR_SYSTEM_FAMILY "unknown") - ENDIF () -ENDIF () +if(NOT DEFINED STAR_LITTLE_ENDIAN) + include(TestBigEndian) + test_big_endian(BIGENDIAN) + if(NOT BIGENDIAN) + set(STAR_LITTLE_ENDIAN TRUE) + else() + set(STAR_LITTLE_ENDIAN FALSE) + endif() +endif() + +# System name, like windows, macos, linux, freebsd, or(generic) unix +if(NOT DEFINED STAR_SYSTEM) + if(WIN32) + set(STAR_SYSTEM "windows") + elseif(APPLE AND ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(STAR_SYSTEM "macos") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(STAR_SYSTEM "linux") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + set(STAR_SYSTEM "freebsd") + elseif(UNIX) + set(STAR_SYSTEM "unix") + else() + set(STAR_SYSTEM "unknown") + endif() +endif() + +if(NOT DEFINED STAR_SYSTEM_FAMILY) + if(WIN32) + set(STAR_SYSTEM_FAMILY "windows") + elseif(UNIX) + set(STAR_SYSTEM_FAMILY "unix") + else() + set(STAR_SYSTEM_FAMILY "unknown") + endif() +endif() # C/C++ compiler ID, like clang, gnu, or msvc -IF (NOT DEFINED STAR_COMPILER) - IF (NOT CMAKE_C_COMPILER_ID STREQUAL CMAKE_CXX_COMPILER_ID) - MESSAGE (FATAL_ERROR "C and C++ compiler id do not match, unsupported build configuration") - ENDIF () - - IF (CMAKE_C_COMPILER_ID STREQUAL "Clang") - SET (STAR_COMPILER "clang") - ELSEIF (CMAKE_COMPILER_IS_GNUC) - SET (STAR_COMPILER "gnu") - ELSEIF (MSVC) - SET (STAR_COMPILER "msvc") - ELSE () - STRING (TOLOWER "${CMAKE_C_COMPILER_ID}" STAR_COMPILER) - ENDIF () -ENDIF () +if(NOT DEFINED STAR_COMPILER) + if(NOT CMAKE_C_COMPILER_ID STREQUAL CMAKE_CXX_COMPILER_ID) + message(FATAL_ERROR "C and C++ compiler id do not match, unsupported build configuration") + endif() + + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + set(STAR_COMPILER "clang") + elseif(CMAKE_COMPILER_IS_GNUC) + set(STAR_COMPILER "gnu") + elseif(MSVC) + set(STAR_COMPILER "msvc") + else() + string(TOLOWER "${CMAKE_C_COMPILER_ID}" STAR_COMPILER) + endif() +endif() # Enable OPTIONs based on the discovered system / environment... -IF (STAR_COMPILER STREQUAL "gnu") - OPTION (STAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX "Statically link libgcc and libstdc++" OFF) - OPTION (STAR_ENABLE_GCC_PROFILING "Enable gcc/g++ profiling via the -pg flag" OFF) - OPTION (STAR_ENABLE_GLIBCXX_DEBUG "Enable _GLIBCXX_DEBUG for g++" OFF) -ENDIF () +if(STAR_COMPILER STREQUAL "gnu") + option(STAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX "Statically link libgcc and libstdc++" OFF) + option(STAR_ENABLE_GCC_PROFILING "Enable gcc/g++ profiling via the -pg flag" OFF) + option(STAR_ENABLE_GLIBCXX_DEBUG "Enable _GLIBCXX_DEBUG for g++" OFF) +endif() -IF (STAR_COMPILER STREQUAL "msvc") - OPTION (STAR_ENABLE_STATIC_MSVC_RUNTIME "Statically link with the CRT" OFF) -ENDIF () +if(STAR_COMPILER STREQUAL "msvc") + option(STAR_ENABLE_STATIC_MSVC_RUNTIME "Statically link with the CRT" OFF) +endif() -OPTION (STAR_BUILD_GUI "Build GUI utilities and Client" ON) +option(STAR_BUILD_GUI "Build GUI utilities and Client" ON) -IF (STAR_BUILD_GUI) - OPTION (STAR_BUILD_QT_TOOLS "Build GUI utilities that require Qt" OFF) - OPTION (STAR_ENABLE_STEAM_INTEGRATION "Use Steam platform services" OFF) - OPTION (STAR_ENABLE_DISCORD_INTEGRATION "Use Discord platform services" OFF) -ENDIF () +if(STAR_BUILD_GUI) + option(STAR_BUILD_QT_TOOLS "Build GUI utilities that require Qt" OFF) + option(STAR_ENABLE_STEAM_INTEGRATION "Use Steam platform services" OFF) + option(STAR_ENABLE_DISCORD_INTEGRATION "Use Discord platform services" OFF) +endif() -OPTION (STAR_LUA_APICHECK "Use lua api checks" OFF) -OPTION (STAR_USE_JEMALLOC "Use jemalloc allocators" OFF) +option(STAR_LUA_APICHECK "Use lua api checks" OFF) +option(STAR_USE_JEMALLOC "Use jemalloc allocators" OFF) # Report all the discovered system / environment settings and all options. -MESSAGE (STATUS "Source ID: ${STAR_SOURCE_IDENTIFIER}") -MESSAGE (STATUS "Architecture: ${STAR_ARCHITECTURE}") -MESSAGE (STATUS "Little Endian: ${STAR_LITTLE_ENDIAN}") -MESSAGE (STATUS "System: ${STAR_SYSTEM}") -MESSAGE (STATUS "System family: ${STAR_SYSTEM_FAMILY}") -MESSAGE (STATUS "C/C++ compiler: ${STAR_COMPILER}") +message(STATUS "Source ID: ${STAR_SOURCE_IDENTIFIER}") +message(STATUS "Architecture: ${STAR_ARCHITECTURE}") +message(STATUS "Little Endian: ${STAR_LITTLE_ENDIAN}") +message(STATUS "System: ${STAR_SYSTEM}") +message(STATUS "System family: ${STAR_SYSTEM_FAMILY}") +message(STATUS "C/C++ compiler: ${STAR_COMPILER}") -IF (DEFINED STAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX) - MESSAGE (STATUS "Statically linking to libgcc / libstdc++: ${STAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX}") -ENDIF () +if(DEFINED STAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX) + message(STATUS "Statically linking to libgcc / libstdc++: ${STAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX}") +endif() -IF (DEFINED STAR_ENABLE_STATIC_MSVC_RUNTIME) - MESSAGE (STATUS "Statically linking to CRT: ${STAR_ENABLE_STATIC_MSVC_RUNTIME}") -ENDIF () +if(DEFINED STAR_ENABLE_STATIC_MSVC_RUNTIME) + message(STATUS "Statically linking to CRT: ${STAR_ENABLE_STATIC_MSVC_RUNTIME}") +endif() -IF (DEFINED STAR_ENABLE_GLIBCXX_DEBUG) - MESSAGE (STATUS "Enabling _GLIBCXX_DEBUG: ${STAR_ENABLE_GLIBCXX_DEBUG}") -ENDIF () +if(DEFINED STAR_ENABLE_GLIBCXX_DEBUG) + message(STATUS "Enabling _GLIBCXX_DEBUG: ${STAR_ENABLE_GLIBCXX_DEBUG}") +endif() -MESSAGE (STATUS "Building GUI: ${STAR_BUILD_GUI}") +message(STATUS "Building GUI: ${STAR_BUILD_GUI}") -IF (DEFINED STAR_BUILD_QT_TOOLS) - MESSAGE (STATUS "Building Qt tools: ${STAR_BUILD_QT_TOOLS}") -ENDIF () +if(DEFINED STAR_BUILD_QT_TOOLS) + message(STATUS "Building Qt tools: ${STAR_BUILD_QT_TOOLS}") +endif() -IF (DEFINED STAR_ENABLE_STEAM_INTEGRATION) - MESSAGE (STATUS "Using Steam platform services: ${STAR_ENABLE_STEAM_INTEGRATION}") -ENDIF () +if(DEFINED STAR_ENABLE_STEAM_INTEGRATION) + message(STATUS "Using Steam platform services: ${STAR_ENABLE_STEAM_INTEGRATION}") +endif() -IF (DEFINED STAR_ENABLE_DISCORD_INTEGRATION) - MESSAGE (STATUS "Using Discrod platform services: ${STAR_ENABLE_DISCORD_INTEGRATION}") -ENDIF () +if(DEFINED STAR_ENABLE_DISCORD_INTEGRATION) + message(STATUS "Using Discrod platform services: ${STAR_ENABLE_DISCORD_INTEGRATION}") +endif() -MESSAGE (STATUS "Using Lua API checks: ${STAR_LUA_APICHECK}") -MESSAGE (STATUS "Using jemalloc: ${STAR_USE_JEMALLOC}") +message(STATUS "Using Lua API checks: ${STAR_LUA_APICHECK}") +message(STATUS "Using jemalloc: ${STAR_USE_JEMALLOC}") # Set C defines and cmake variables based on the build settings we have now # determined... # Set a cmake variable to true and define a corresponding C/C++ definition -FUNCTION (SET_FLAG flagValue) - SET (${flagValue} TRUE PARENT_SCOPE) - ADD_DEFINITIONS (-D${flagValue}) -ENDFUNCTION () - -IF (STAR_LITTLE_ENDIAN) - SET_FLAG (STAR_LITTLE_ENDIAN) -ELSEIF () - SET_FLAG (STAR_BIG_ENDIAN) -ENDIF () - -IF (STAR_ARCHITECTURE STREQUAL "i386") - SET_FLAG (STAR_ARCHITECTURE_I386) -ELSEIF (STAR_ARCHITECTURE STREQUAL "x86_64") - SET_FLAG (STAR_ARCHITECTURE_X86_64) -ENDIF () - -IF (STAR_SYSTEM STREQUAL "windows") - SET_FLAG (STAR_SYSTEM_WINDOWS) -ELSEIF (STAR_SYSTEM STREQUAL "macos") - SET_FLAG (STAR_SYSTEM_MACOS) -ELSEIF (STAR_SYSTEM STREQUAL "linux") - SET_FLAG (STAR_SYSTEM_LINUX) -ELSEIF (STAR_SYSTEM STREQUAL "freebsd") - SET_FLAG (STAR_SYSTEM_FREEBSD) -ENDIF () - -IF (STAR_SYSTEM_FAMILY STREQUAL "windows") - SET_FLAG (STAR_SYSTEM_FAMILY_WINDOWS) -ELSEIF (STAR_SYSTEM_FAMILY STREQUAL "unix") - SET_FLAG (STAR_SYSTEM_FAMILY_UNIX) -ENDIF () - -IF (STAR_COMPILER STREQUAL "gnu") - SET_FLAG (STAR_COMPILER_GNU) -ELSEIF (STAR_COMPILER STREQUAL "clang") - SET_FLAG (STAR_COMPILER_CLANG) -ELSEIF (STAR_COMPILER STREQUAL "msvc") - SET_FLAG (STAR_COMPILER_MSVC) -ENDIF () - -IF (STAR_LUA_APICHECK) - ADD_DEFINITIONS (-DLUA_USE_APICHECK) -ENDIF () - -IF (STAR_SYSTEM_WINDOWS) +function(SET_FLAG flagValue) + set(${flagValue} TRUE PARENT_SCOPE) + add_definitions(-D${flagValue}) +endfunction() + +if(STAR_LITTLE_ENDIAN) + set_flag(STAR_LITTLE_ENDIAN) +elseif() + set_flag(STAR_BIG_ENDIAN) +endif() + +if(STAR_ARCHITECTURE STREQUAL "i386") + set_flag(STAR_ARCHITECTURE_I386) +elseif(STAR_ARCHITECTURE STREQUAL "x86_64") + set_flag(STAR_ARCHITECTURE_X86_64) +endif() + +if(STAR_SYSTEM STREQUAL "windows") + set_flag(STAR_SYSTEM_WINDOWS) +elseif(STAR_SYSTEM STREQUAL "macos") + set_flag(STAR_SYSTEM_MACOS) +elseif(STAR_SYSTEM STREQUAL "linux") + set_flag(STAR_SYSTEM_LINUX) +elseif(STAR_SYSTEM STREQUAL "freebsd") + set_flag(STAR_SYSTEM_FREEBSD) +endif() + +if(STAR_SYSTEM_FAMILY STREQUAL "windows") + set_flag(STAR_SYSTEM_FAMILY_WINDOWS) +elseif(STAR_SYSTEM_FAMILY STREQUAL "unix") + set_flag(STAR_SYSTEM_FAMILY_UNIX) +endif() + +if(STAR_COMPILER STREQUAL "gnu") + set_flag(STAR_COMPILER_GNU) +elseif(STAR_COMPILER STREQUAL "clang") + set_flag(STAR_COMPILER_CLANG) +elseif(STAR_COMPILER STREQUAL "msvc") + set_flag(STAR_COMPILER_MSVC) +endif() + +if(STAR_LUA_APICHECK) + add_definitions(-DLUA_USE_APICHECK) +endif() + +if(STAR_SYSTEM_WINDOWS) # LUA_USE_WINDOWS is automatically defined in luaconf if _WIN32 is defined -ELSEIF (STAR_SYSTEM_MACOS) +elseif(STAR_SYSTEM_MACOS) ADD_DEFINITIONS(-DLUA_USE_MACOSX) -ELSEIF (STAR_SYSTEM_LINUX) +elseif(STAR_SYSTEM_LINUX) ADD_DEFINITIONS(-DLUA_USE_LINUX) -ELSEIF (STAR_SYSTEM_FAMILY_UNIX) +elseif(STAR_SYSTEM_FAMILY_UNIX) ADD_DEFINITIONS(-DLUA_USE_POSIX) -ENDIF () +endif() -IF (STAR_ENABLE_STEAM_INTEGRATION) - ADD_DEFINITIONS (-DSTAR_ENABLE_STEAM_INTEGRATION) -ENDIF () +if(STAR_ENABLE_STEAM_INTEGRATION) + add_definitions(-DSTAR_ENABLE_STEAM_INTEGRATION) +endif() -IF (STAR_ENABLE_DISCORD_INTEGRATION) - ADD_DEFINITIONS (-DSTAR_ENABLE_DISCORD_INTEGRATION) -ENDIF () +if(STAR_ENABLE_DISCORD_INTEGRATION) + add_definitions(-DSTAR_ENABLE_DISCORD_INTEGRATION) +endif() -IF (STAR_USE_JEMALLOC) - ADD_DEFINITIONS (-DSTAR_USE_JEMALLOC) -ENDIF () +if(STAR_USE_JEMALLOC) + add_definitions(-DSTAR_USE_JEMALLOC) +endif() # Set C/C++ compiler flags based on build environment... -IF (STAR_COMPILER_GNU) - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wuninitialized -Wunreachable-code -Wformat -no-pie") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -Wuninitialized -Wunreachable-code -Wformat -no-pie") +if(STAR_COMPILER_GNU) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wuninitialized -Wunreachable-code -Wformat -no-pie") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -Wuninitialized -Wunreachable-code -Wformat -no-pie") - IF (STAR_SYSTEM_FAMILY_WINDOWS) - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthreads") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthreads") - ELSE () - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -D_REENTRANT") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -D_REENTRANT") - ENDIF () + if(STAR_SYSTEM_FAMILY_WINDOWS) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthreads") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthreads") + else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -D_REENTRANT") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -D_REENTRANT") + endif() - IF (STAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX) - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") - ENDIF () + if(STAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") + endif() - IF (STAR_ENABLE_GCC_PROFILING) - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") - ENDIF () + if(STAR_ENABLE_GCC_PROFILING) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") + endif() - SET (CMAKE_C_FLAGS_DEBUG "-g -Og") - SET (CMAKE_CXX_FLAGS_DEBUG "-g -Og") + set(CMAKE_C_FLAGS_DEBUG "-g -Og") + set(CMAKE_CXX_FLAGS_DEBUG "-g -Og") - SET (CMAKE_C_FLAGS_RELWITHASSERTS "-g -Ofast") - SET (CMAKE_CXX_FLAGS_RELWITHASSERTS "-g -Ofast") + set(CMAKE_C_FLAGS_RELWITHASSERTS "-g -Ofast") + set(CMAKE_CXX_FLAGS_RELWITHASSERTS "-g -Ofast") - SET (CMAKE_C_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -Ofast") - SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -Ofast") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -Ofast") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -Ofast") - SET (CMAKE_C_FLAGS_RELEASE "-DNDEBUG -Ofast") - SET (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -Ofast") + set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -Ofast") + set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -Ofast") -ELSEIF (STAR_COMPILER_CLANG) - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wuninitialized -Wno-parentheses-equality -Wno-deprecated-declarations") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -Wuninitialized -Wno-parentheses-equality -Wno-deprecated-declarations") +elseif(STAR_COMPILER_CLANG) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wuninitialized -Wno-parentheses-equality -Wno-deprecated-declarations") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -Wuninitialized -Wno-parentheses-equality -Wno-deprecated-declarations") - IF (STAR_SYSTEM_MACOS) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") - SET (CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14") - SET (CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") - ELSEIF () - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -D_REENTRANT") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -D_REENTRANT") - ENDIF () + if(STAR_SYSTEM_MACOS) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") + set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14") + set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") + elseif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -D_REENTRANT") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -D_REENTRANT") + endif() - SET (CMAKE_C_FLAGS_DEBUG "-g") - SET (CMAKE_CXX_FLAGS_DEBUG "-g") + set(CMAKE_C_FLAGS_DEBUG "-g") + set(CMAKE_CXX_FLAGS_DEBUG "-g") - SET (CMAKE_C_FLAGS_RELWITHASSERTS "-g -Ofast") - SET (CMAKE_CXX_FLAGS_RELWITHASSERTS "-g -Ofast") + set(CMAKE_C_FLAGS_RELWITHASSERTS "-g -Ofast") + set(CMAKE_CXX_FLAGS_RELWITHASSERTS "-g -Ofast") - SET (CMAKE_C_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -Ofast") - SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -Ofast") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -Ofast") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -Ofast") - SET (CMAKE_C_FLAGS_RELEASE "-DNDEBUG -Ofast") - SET (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -Ofast") + set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -Ofast") + set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -Ofast") -ELSEIF (STAR_COMPILER_MSVC) +elseif(STAR_COMPILER_MSVC) # /MP - Multi-processor building # /EHsc - Enable normal C++ exception handling - # /bigobj - More sections in .obj files (Cannot build in Debug without it) + # /bigobj - More sections in .obj files(Cannot build in Debug without it) # /MT - Use multi-threaded statically linked C runtime library # /GA - Optimize for windows application # /Ox - Full optimization @@ -286,8 +286,8 @@ ELSEIF (STAR_COMPILER_MSVC) # /Gy - Use function-level linking # /wd4996 - Disable warnings about unsafe C functions # /wd4351 - Disable warnings about new behavior of default initialization of - # arrays (which is the correct behavior anyway) - # /wd4800 - Disable warnings about using non-bool as true or false (useless + # arrays(which is the correct behavior anyway) + # /wd4800 - Disable warnings about using non-bool as true or false(useless # performance warning) # /wd4244 - Disable warnings about type conversion loss of data, it's a nice # warning, but it triggers on lots and lots of harmless things that no @@ -301,120 +301,120 @@ ELSEIF (STAR_COMPILER_MSVC) # /wd4624 - Silence implicitly deleted destructor warnings that show up when # using unions in interesting ways. - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP /EHsc /bigobj /wd4996 /wd4351 /wd4800 /wd4244 /wd4305 /wd4267 /wd4456 /wd4503 /wd4250 /wd4624") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /EHsc /bigobj /wd4996 /wd4351 /wd4800 /wd4244 /wd4305 /wd4267 /wd4456 /wd4503 /wd4250 /wd4624") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP /EHsc /bigobj /wd4996 /wd4351 /wd4800 /wd4244 /wd4305 /wd4267 /wd4456 /wd4503 /wd4250 /wd4624") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /EHsc /bigobj /wd4996 /wd4351 /wd4800 /wd4244 /wd4305 /wd4267 /wd4456 /wd4503 /wd4250 /wd4624") - IF (STAR_ENABLE_STATIC_MSVC_RUNTIME) - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MT") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MT") - ENDIF () + if(STAR_ENABLE_STATIC_MSVC_RUNTIME) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MT") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MT") + endif() - SET (CMAKE_C_FLAGS_DEBUG "/Zi /Od") - SET (CMAKE_CXX_FLAGS_DEBUG "/Zi /Od") + set(CMAKE_C_FLAGS_DEBUG "/Zi /Od") + set(CMAKE_CXX_FLAGS_DEBUG "/Zi /Od") - SET (CMAKE_C_FLAGS_RELWITHASSERTS "/Ox /fp:fast /GA /GS- /Zi /Gy") - SET (CMAKE_CXX_FLAGS_RELWITHASSERTS "/Ox /fp:fast /GA /GS- /Zi /Gy") + set(CMAKE_C_FLAGS_RELWITHASSERTS "/Ox /fp:fast /GA /GS- /Zi /Gy") + set(CMAKE_CXX_FLAGS_RELWITHASSERTS "/Ox /fp:fast /GA /GS- /Zi /Gy") - SET (CMAKE_C_FLAGS_RELWITHDEBINFO "/Ox /fp:fast /GA /GS- /Zi /Gy /DNDEBUG") - SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Ox /fp:fast /GA /GS- /Zi /Gy /DNDEBUG") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "/Ox /fp:fast /GA /GS- /Zi /Gy /DNDEBUG") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Ox /fp:fast /GA /GS- /Zi /Gy /DNDEBUG") - SET (CMAKE_C_FLAGS_RELEASE "/Ox /fp:fast /GA /GS- /Gy /DNDEBUG") - SET (CMAKE_CXX_FLAGS_RELEASE "/Ox /fp:fast /GA /GS- /Gy /DNDEBUG") + set(CMAKE_C_FLAGS_RELEASE "/Ox /fp:fast /GA /GS- /Gy /DNDEBUG") + set(CMAKE_CXX_FLAGS_RELEASE "/Ox /fp:fast /GA /GS- /Gy /DNDEBUG") - IF (STAR_ARCHITECTURE_I386) + if(STAR_ARCHITECTURE_I386) # Assume all 32 bit target cpus support MMX, SSE, and SSE2 - SET (CMAKE_C_FLAGS_RELWITHASSERTS "${CMAKE_C_FLAGS_RELWITHASSERTS} /arch:SSE2") - SET (CMAKE_CXX_FLAGS_RELWITHASSERTS "${CMAKE_CXX_FLAGS_RELWITHASSERTS} /arch:SSE2") + set(CMAKE_C_FLAGS_RELWITHASSERTS "${CMAKE_C_FLAGS_RELWITHASSERTS} /arch:SSE2") + set(CMAKE_CXX_FLAGS_RELWITHASSERTS "${CMAKE_CXX_FLAGS_RELWITHASSERTS} /arch:SSE2") - SET (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /arch:SSE2") - SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /arch:SSE2") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /arch:SSE2") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /arch:SSE2") - SET (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /arch:SSE2") - SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:SSE2") - ENDIF () + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /arch:SSE2") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:SSE2") + endif() - ADD_DEFINITIONS (/DUNICODE) - ADD_DEFINITIONS (/D_UNICODE) - ADD_DEFINITIONS (/DNOMINMAX) + add_definitions(/DUNICODE) + add_definitions(/D_UNICODE) + add_definitions(/DNOMINMAX) -ELSE () - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pthread -D_REENTRANT") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -pthread -D_REENTRANT") +else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pthread -D_REENTRANT") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -pthread -D_REENTRANT") - SET (CMAKE_C_FLAGS_DEBUG "-g") - SET (CMAKE_CXX_FLAGS_DEBUG "-g") + set(CMAKE_C_FLAGS_DEBUG "-g") + set(CMAKE_CXX_FLAGS_DEBUG "-g") - SET (CMAKE_C_FLAGS_RELWITHASSERTS "-g -O2") - SET (CMAKE_CXX_FLAGS_RELWITHASSERTS "-g -O2") + set(CMAKE_C_FLAGS_RELWITHASSERTS "-g -O2") + set(CMAKE_CXX_FLAGS_RELWITHASSERTS "-g -O2") - SET (CMAKE_C_FLAGS_RELWITHDEBINFO "-DNDEBUG -g -O2") - SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG -g -O2") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-DNDEBUG -g -O2") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG -g -O2") - SET (CMAKE_C_FLAGS_RELEASE "$-DNDEBUG -O2") - SET (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O2") + set(CMAKE_C_FLAGS_RELEASE "$-DNDEBUG -O2") + set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O2") -ENDIF () +endif() # Set other global build settings based on environment... -IF (STAR_SYSTEM_MACOS) - SET (CMAKE_MODULE_LINKER_FLAGS "-flat_namespace -undefined suppress") -ELSEIF (STAR_SYSTEM_WINDOWS) - SET (CMAKE_RC_COMPILER_INIT windres) +if(STAR_SYSTEM_MACOS) + set(CMAKE_MODULE_LINKER_FLAGS "-flat_namespace -undefined suppress") +elseif(STAR_SYSTEM_WINDOWS) + set(CMAKE_RC_COMPILER_INIT windres) - ENABLE_LANGUAGE (RC) - SET (CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") -ENDIF () + enable_language(RC) + set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") +endif() -IF (STAR_COMPILER STREQUAL "msvc") +if(STAR_COMPILER STREQUAL "msvc") # /largeaddressaware - Make 32 bit build able to use 3GB addresses # /OPT:REF - Eliminates functions and data that are never referenced # /OPT:ICF - Performs identical COMDAT folding # /PDBCompress - Hint to windows that it should compress the resulting PDB files - SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /largeaddressaware /OPT:REF /OPT:ICF /PDBCompress") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /largeaddressaware /OPT:REF /OPT:ICF /PDBCompress") # Make sure RelWithAsserts has debugging enabled - SET (CMAKE_EXE_LINKER_FLAGS_RELWITHASSERTS "${CMAKE_EXE_LINKER_FLAGS_RELWITHASSERTS} /DEBUG") -ENDIF () + set(CMAKE_EXE_LINKER_FLAGS_RELWITHASSERTS "${CMAKE_EXE_LINKER_FLAGS_RELWITHASSERTS} /DEBUG") +endif() -IF (STAR_SYSTEM_WINDOWS) - SET (CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} ws2_32.lib iphlpapi.lib shlwapi.lib dbghelp.lib") - SET (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} ws2_32.lib iphlpapi.lib shlwapi.lib dbghelp.lib") +if(STAR_SYSTEM_WINDOWS) + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} ws2_32.lib iphlpapi.lib shlwapi.lib dbghelp.lib") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} ws2_32.lib iphlpapi.lib shlwapi.lib dbghelp.lib") -ELSEIF (STAR_SYSTEM_LINUX) - SET (CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lpthread -ldl -lrt") - SET (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lpthread -ldl -lrt") +elseif(STAR_SYSTEM_LINUX) + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lpthread -ldl -lrt") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lpthread -ldl -lrt") -ELSEIF (STAR_SYSTEM_FREEBSD) - SET (CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lpthread -lrt") - SET (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lpthread -lrt") +elseif(STAR_SYSTEM_FREEBSD) + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lpthread -lrt") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lpthread -lrt") -ENDIF () +endif() # Find all required external libraries, based on build settings... -IF (STAR_USE_JEMALLOC) +if(STAR_USE_JEMALLOC) # Assumes jemalloc was configured with a "je_" function prefix - FIND_PACKAGE (JeMalloc REQUIRED) + find_package(JeMalloc REQUIRED) - INCLUDE_DIRECTORIES (SYSTEM ${JEMALLOC_INCLUDE_DIR}) - SET (STAR_EXT_LIBS ${JEMALLOC_LIBRARY}) -ENDIF () + include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIR}) + set(STAR_EXT_LIBS ${JEMALLOC_LIBRARY}) +endif() -FIND_PACKAGE (ZLIB REQUIRED) -FIND_PACKAGE (PNG REQUIRED) -FIND_PACKAGE (Freetype REQUIRED) -FIND_PACKAGE (OggVorbis REQUIRED) +find_package(ZLIB REQUIRED) +find_package(PNG REQUIRED) +find_package(Freetype REQUIRED) +find_package(OggVorbis REQUIRED) -INCLUDE_DIRECTORIES (SYSTEM +include_directories(SYSTEM ${ZLIB_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ) -SET (STAR_EXT_LIBS ${STAR_EXT_LIBS} +set(STAR_EXT_LIBS ${STAR_EXT_LIBS} ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY} @@ -423,65 +423,65 @@ SET (STAR_EXT_LIBS ${STAR_EXT_LIBS} ${ZLIB_LIBRARY} ) -IF (STAR_BUILD_GUI) - FIND_PACKAGE (SDL2 REQUIRED) - INCLUDE_DIRECTORIES (SYSTEM ${SDL2_INCLUDE_DIR}) - SET (STAR_EXT_GUI_LIBS ${SDL2_LIBRARY}) +if(STAR_BUILD_GUI) + find_package(SDL2 REQUIRED) + include_directories(SYSTEM ${SDL2_INCLUDE_DIR}) + set(STAR_EXT_GUI_LIBS ${SDL2_LIBRARY}) - FIND_PACKAGE (OpenGL REQUIRED) - FIND_PACKAGE (GLEW REQUIRED) + find_package(OpenGL REQUIRED) + find_package(GLEW REQUIRED) - INCLUDE_DIRECTORIES (SYSTEM ${GLEW_INCLUDE_DIR} ${SDL2_INCLUDE_DIR}) - SET (STAR_EXT_GUI_LIBS ${STAR_EXT_GUI_LIBS} ${OPENGL_LIBRARY} ${GLEW_LIBRARY}) + include_directories(SYSTEM ${GLEW_INCLUDE_DIR} ${SDL2_INCLUDE_DIR}) + set(STAR_EXT_GUI_LIBS ${STAR_EXT_GUI_LIBS} ${OPENGL_LIBRARY} ${GLEW_LIBRARY}) - IF (STAR_ENABLE_STEAM_INTEGRATION) - FIND_PACKAGE (SteamApi REQUIRED) + if(STAR_ENABLE_STEAM_INTEGRATION) + find_package(SteamApi REQUIRED) - INCLUDE_DIRECTORIES (SYSTEM ${STEAM_API_INCLUDE_DIR}) - SET (STAR_EXT_GUI_LIBS ${STAR_EXT_GUI_LIBS} ${STEAM_API_LIBRARY}) - ENDIF () + include_directories(SYSTEM ${STEAM_API_INCLUDE_DIR}) + set(STAR_EXT_GUI_LIBS ${STAR_EXT_GUI_LIBS} ${STEAM_API_LIBRARY}) + endif() - IF (STAR_ENABLE_DISCORD_INTEGRATION) - FIND_PACKAGE (DiscordApi REQUIRED) + if(STAR_ENABLE_DISCORD_INTEGRATION) + find_package(DiscordApi REQUIRED) - INCLUDE_DIRECTORIES (SYSTEM ${DISCORD_API_INCLUDE_DIR}) - SET (STAR_EXT_GUI_LIBS ${STAR_EXT_GUI_LIBS} ${DISCORD_API_LIBRARY}) - ENDIF () -ENDIF () + include_directories(SYSTEM ${DISCORD_API_INCLUDE_DIR}) + set(STAR_EXT_GUI_LIBS ${STAR_EXT_GUI_LIBS} ${DISCORD_API_LIBRARY}) + endif() +endif() # Set basic build flags, include all the relevant source directories, based on # build settings... -SET (BUILD_SHARED_LIBS false) +set(BUILD_SHARED_LIBS false) -# First set output dir for the generic no-config case (e.g. macos / linux) -SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../dist) +# First set output dir for the generic no-config case(e.g. macos / linux) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../dist) -# Second, set output dir for multi-config builds (e.g. msvc) -FOREACH (OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES}) - STRING (TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG) - SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_SOURCE_DIR}/../dist) -ENDFOREACH (OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES) +# Second, set output dir for multi-config builds(e.g. msvc) +foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES}) + string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_SOURCE_DIR}/../dist) +endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES) # External code included with starbound source, which core depends on -SET (STAR_EXTERN_INCLUDES ${PROJECT_SOURCE_DIR}/extern) -ADD_SUBDIRECTORY (extern) +set(STAR_EXTERN_INCLUDES ${PROJECT_SOURCE_DIR}/extern) +add_subdirectory(extern) # Core support code, not specific to starbound. -SET (STAR_CORE_INCLUDES ${PROJECT_SOURCE_DIR}/core) -ADD_SUBDIRECTORY (core) +set(STAR_CORE_INCLUDES ${PROJECT_SOURCE_DIR}/core) +add_subdirectory(core) # Less general purpose code than core that is available to both the game and # application modules. -SET (STAR_BASE_INCLUDES ${PROJECT_SOURCE_DIR}/base) -ADD_SUBDIRECTORY (base) +set(STAR_BASE_INCLUDES ${PROJECT_SOURCE_DIR}/base) +add_subdirectory(base) # Platform APIs that are implemented by the application module -SET (STAR_PLATFORM_INCLUDES ${PROJECT_SOURCE_DIR}/platform) -ADD_SUBDIRECTORY (platform) +set(STAR_PLATFORM_INCLUDES ${PROJECT_SOURCE_DIR}/platform) +add_subdirectory(platform) # Core game logic used by both server and client. -SET (STAR_GAME_INCLUDES +set(STAR_GAME_INCLUDES ${PROJECT_SOURCE_DIR}/game ${PROJECT_SOURCE_DIR}/game/interfaces ${PROJECT_SOURCE_DIR}/game/items @@ -489,45 +489,45 @@ SET (STAR_GAME_INCLUDES ${PROJECT_SOURCE_DIR}/game/scripting ${PROJECT_SOURCE_DIR}/game/terrain ) -ADD_SUBDIRECTORY (game) +add_subdirectory(game) # Googletest based tests ENABLE_TESTING() -ADD_SUBDIRECTORY (test) +add_subdirectory(test) # Starbound stand-alone server. -ADD_SUBDIRECTORY (server) +add_subdirectory(server) # cmdline utilities -ADD_SUBDIRECTORY (utility) +add_subdirectory(utility) -IF (STAR_BUILD_GUI) +if(STAR_BUILD_GUI) # Handles creating windows, keyboard / mouse / joystick input, and the 2d # rendering model. - SET (STAR_APPLICATION_INCLUDES ${PROJECT_SOURCE_DIR}/application) - ADD_SUBDIRECTORY (application) + set(STAR_APPLICATION_INCLUDES ${PROJECT_SOURCE_DIR}/application) + add_subdirectory(application) # Rendering code not dependent on widget system - SET (STAR_RENDERING_INCLUDES ${PROJECT_SOURCE_DIR}/rendering) - ADD_SUBDIRECTORY (rendering) + set(STAR_RENDERING_INCLUDES ${PROJECT_SOURCE_DIR}/rendering) + add_subdirectory(rendering) # Panes and Widgets - SET (STAR_WINDOWING_INCLUDES ${PROJECT_SOURCE_DIR}/windowing) - ADD_SUBDIRECTORY (windowing) + set(STAR_WINDOWING_INCLUDES ${PROJECT_SOURCE_DIR}/windowing) + add_subdirectory(windowing) # Client interface code - SET (STAR_FRONTEND_INCLUDES ${PROJECT_SOURCE_DIR}/frontend) - ADD_SUBDIRECTORY (frontend) + set(STAR_FRONTEND_INCLUDES ${PROJECT_SOURCE_DIR}/frontend) + add_subdirectory(frontend) # Starbound game / client - ADD_SUBDIRECTORY (client) + add_subdirectory(client) # Qt GUI tools - IF (STAR_BUILD_QT_TOOLS) - ADD_SUBDIRECTORY (json_tool) - - if (STAR_ENABLE_STEAM_INTEGRATION) - ADD_SUBDIRECTORY (mod_uploader) - ENDIF () - ENDIF () -ENDIF () + if(STAR_BUILD_QT_TOOLS) + add_subdirectory(json_tool) + + if(STAR_ENABLE_STEAM_INTEGRATION) + add_subdirectory(mod_uploader) + endif() + endif() +endif() diff --git a/source/application/CMakeLists.txt b/source/application/CMakeLists.txt index db557aa..9d6a7ff 100644 --- a/source/application/CMakeLists.txt +++ b/source/application/CMakeLists.txt @@ -1,11 +1,11 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_PLATFORM_INCLUDES} ${STAR_APPLICATION_INCLUDES} ) -SET (star_application_HEADERS +set(star_application_HEADERS StarApplication.hpp StarApplicationController.hpp StarMainApplication.hpp @@ -13,40 +13,40 @@ SET (star_application_HEADERS StarRenderer.hpp ) -SET (star_application_SOURCES +set(star_application_SOURCES StarApplication.cpp StarInputEvent.cpp StarRenderer.cpp ) -SET (star_application_HEADERS ${star_application_HEADERS} +set(star_application_HEADERS ${star_application_HEADERS} StarP2PNetworkingService_pc.hpp StarPlatformServices_pc.hpp StarRenderer_opengl20.hpp ) -SET (star_application_SOURCES ${star_application_SOURCES} +set(star_application_SOURCES ${star_application_SOURCES} StarMainApplication_sdl.cpp StarP2PNetworkingService_pc.cpp StarPlatformServices_pc.cpp StarRenderer_opengl20.cpp ) -IF (STAR_ENABLE_STEAM_INTEGRATION) - SET (star_application_HEADERS ${star_application_HEADERS} +if(STAR_ENABLE_STEAM_INTEGRATION) + set(star_application_HEADERS ${star_application_HEADERS} StarDesktopService_pc_steam.hpp StarStatisticsService_pc_steam.hpp StarUserGeneratedContentService_pc_steam.hpp ) - SET (star_application_SOURCES ${star_application_SOURCES} + set(star_application_SOURCES ${star_application_SOURCES} StarDesktopService_pc_steam.cpp StarStatisticsService_pc_steam.cpp StarUserGeneratedContentService_pc_steam.cpp ) -ENDIF () +endif() -IF (STAR_ENABLE_DISCORD_INTEGRATION) - SET (star_application_SOURCES ${star_application_SOURCES} +if(STAR_ENABLE_DISCORD_INTEGRATION) + set(star_application_SOURCES ${star_application_SOURCES} discord/activity_manager.cpp discord/application_manager.cpp discord/core.cpp @@ -60,6 +60,6 @@ IF (STAR_ENABLE_DISCORD_INTEGRATION) discord/types.cpp discord/user_manager.cpp ) -ENDIF () +endif() -ADD_LIBRARY (star_application OBJECT ${star_application_SOURCES} ${star_application_HEADERS}) +add_library(star_application OBJECT ${star_application_SOURCES} ${star_application_HEADERS}) diff --git a/source/base/CMakeLists.txt b/source/base/CMakeLists.txt index 03f767f..3fb85c8 100644 --- a/source/base/CMakeLists.txt +++ b/source/base/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_BASE_INCLUDES} ) -SET (star_base_HEADERS +set(star_base_HEADERS StarAnimatedPartSet.hpp StarAssets.hpp StarAssetSource.hpp @@ -21,7 +21,7 @@ SET (star_base_HEADERS StarWorldGeometry.hpp ) -SET (star_base_SOURCES +set(star_base_SOURCES StarAnimatedPartSet.cpp StarAssets.cpp StarCellularLighting.cpp @@ -33,5 +33,5 @@ SET (star_base_SOURCES StarWorldGeometry.cpp ) -CONFIGURE_FILE (StarVersion.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/StarVersion.cpp) -ADD_LIBRARY (star_base OBJECT ${star_base_SOURCES} ${star_base_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/StarVersion.cpp) +configure_file(StarVersion.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/StarVersion.cpp) +add_library(star_base OBJECT ${star_base_SOURCES} ${star_base_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/StarVersion.cpp) diff --git a/source/client/CMakeLists.txt b/source/client/CMakeLists.txt index e9d4d2f..2238cc8 100644 --- a/source/client/CMakeLists.txt +++ b/source/client/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_BASE_INCLUDES} @@ -10,24 +10,24 @@ INCLUDE_DIRECTORIES ( ${STAR_FRONTEND_INCLUDES} ) -SET (star_client_HEADERS +set(star_client_HEADERS StarClientApplication.hpp ) -SET (star_client_SOURCES +set(star_client_SOURCES StarClientApplication.cpp ) -IF (STAR_SYSTEM_WINDOWS) - IF (CMAKE_GENERATOR MATCHES "Visual Studio") # Ninja and possibly some others have problems building resources. - SET (star_client_RESOURCES +if(STAR_SYSTEM_WINDOWS) + if(CMAKE_GENERATOR MATCHES "Visual Studio") # Ninja and possibly some others have problems building resources. + set(star_client_RESOURCES starbound.rc ) - ENDIF () -ENDIF () + endif() +endif() -ADD_EXECUTABLE (starbound WIN32 +add_executable(starbound WIN32 $ $ $ $ $ $ $ $ ${star_client_HEADERS} ${star_client_SOURCES} ${star_client_RESOURCES}) -TARGET_LINK_LIBRARIES (starbound ${STAR_EXT_LIBS} ${STAR_EXT_GUI_LIBS}) +target_link_libraries(starbound ${STAR_EXT_LIBS} ${STAR_EXT_GUI_LIBS}) diff --git a/source/core/CMakeLists.txt b/source/core/CMakeLists.txt index d0a53b1..96b5b45 100644 --- a/source/core/CMakeLists.txt +++ b/source/core/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ) -SET (star_core_HEADERS +set(star_core_HEADERS StarAStar.hpp StarAlgorithm.hpp StarArray.hpp @@ -119,7 +119,7 @@ SET (star_core_HEADERS StarXXHash.hpp ) -SET (star_core_SOURCES +set(star_core_SOURCES StarAudio.cpp StarBTreeDatabase.cpp StarBuffer.cpp @@ -168,8 +168,8 @@ SET (star_core_SOURCES StarWorkerPool.cpp ) -IF (STAR_SYSTEM_FAMILY_UNIX) - SET (star_core_SOURCES ${star_core_SOURCES} +if(STAR_SYSTEM_FAMILY_UNIX) + set(star_core_SOURCES ${star_core_SOURCES} StarDynamicLib_unix.cpp StarException_unix.cpp StarFile_unix.cpp @@ -179,12 +179,12 @@ IF (STAR_SYSTEM_FAMILY_UNIX) StarThread_unix.cpp StarTime_unix.cpp ) -ELSEIF (STAR_SYSTEM_FAMILY_WINDOWS) - SET (star_core_HEADERS ${star_core_HEADERS} +elseif(STAR_SYSTEM_FAMILY_WINDOWS) + set(star_core_HEADERS ${star_core_HEADERS} StarString_windows.hpp ) - SET (star_core_SOURCES ${star_core_SOURCES} + set(star_core_SOURCES ${star_core_SOURCES} StarDynamicLib_windows.cpp StarFile_windows.cpp StarLockFile_windows.cpp @@ -196,6 +196,6 @@ ELSEIF (STAR_SYSTEM_FAMILY_WINDOWS) StarSecureRandom_windows.cpp ) -ENDIF () +endif() -ADD_LIBRARY (star_core OBJECT ${star_core_SOURCES} ${star_core_HEADERS}) +add_library(star_core OBJECT ${star_core_SOURCES} ${star_core_HEADERS}) diff --git a/source/extern/CMakeLists.txt b/source/extern/CMakeLists.txt index 5f0fa77..6bce446 100644 --- a/source/extern/CMakeLists.txt +++ b/source/extern/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} lua ) -SET (star_extern_HEADERS +set(star_extern_HEADERS lauxlib.h lua.h lua.hpp @@ -13,7 +13,7 @@ SET (star_extern_HEADERS xxhash.h ) -SET (star_extern_SOURCES +set(star_extern_SOURCES xxhash.c lua/lapi.c lua/lauxlib.c @@ -50,4 +50,4 @@ SET (star_extern_SOURCES lua/lzio.c ) -ADD_LIBRARY (star_extern OBJECT ${star_extern_SOURCES} ${star_extern_HEADERS}) +add_library(star_extern OBJECT ${star_extern_SOURCES} ${star_extern_HEADERS}) diff --git a/source/frontend/CMakeLists.txt b/source/frontend/CMakeLists.txt index 75145bd..9ac12ea 100644 --- a/source/frontend/CMakeLists.txt +++ b/source/frontend/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_BASE_INCLUDES} @@ -10,7 +10,7 @@ INCLUDE_DIRECTORIES ( ${STAR_FRONTEND_INCLUDES} ) -SET (star_frontend_HEADERS +set(star_frontend_HEADERS StarActionBar.hpp StarAiInterface.hpp StarBookmarkInterface.hpp @@ -56,7 +56,7 @@ SET (star_frontend_HEADERS StarWireInterface.hpp ) -SET (star_frontend_SOURCES +set(star_frontend_SOURCES StarActionBar.cpp StarAiInterface.cpp StarBookmarkInterface.cpp @@ -102,4 +102,4 @@ SET (star_frontend_SOURCES StarWireInterface.cpp ) -ADD_LIBRARY (star_frontend OBJECT ${star_frontend_SOURCES} ${star_frontend_HEADERS}) +add_library(star_frontend OBJECT ${star_frontend_SOURCES} ${star_frontend_HEADERS}) diff --git a/source/game/CMakeLists.txt b/source/game/CMakeLists.txt index 1ff95ff..f9ada56 100644 --- a/source/game/CMakeLists.txt +++ b/source/game/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_BASE_INCLUDES} @@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES ( ${STAR_GAME_INCLUDES} ) -SET (star_game_HEADERS +set(star_game_HEADERS StarActorMovementController.hpp StarAiDatabase.hpp StarAiTypes.hpp @@ -264,7 +264,7 @@ SET (star_game_HEADERS terrain/StarWormCave.hpp ) -SET (star_game_SOURCES +set(star_game_SOURCES StarActorMovementController.cpp StarAiDatabase.cpp StarAiTypes.cpp @@ -499,4 +499,4 @@ SET (star_game_SOURCES terrain/StarWormCave.cpp ) -ADD_LIBRARY (star_game OBJECT ${star_game_SOURCES} ${star_game_HEADERS}) +add_library(star_game OBJECT ${star_game_SOURCES} ${star_game_HEADERS}) diff --git a/source/json_tool/CMakeLists.txt b/source/json_tool/CMakeLists.txt index bd122f5..340a72d 100644 --- a/source/json_tool/CMakeLists.txt +++ b/source/json_tool/CMakeLists.txt @@ -1,19 +1,19 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ) -FIND_PACKAGE (Qt5Core) -FIND_PACKAGE (Qt5Widgets) +find_package(Qt5Core) +find_package(Qt5Widgets) -SET (CMAKE_INCLUDE_CURRENT_DIR ON) -SET (CMAKE_AUTOMOC ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) -ADD_EXECUTABLE (json_tool WIN32 +add_executable(json_tool WIN32 $ $ json_tool.cpp editor_gui.cpp) -QT5_USE_MODULES (json_tool Widgets Gui Core) -TARGET_LINK_LIBRARIES (json_tool ${STAR_EXT_LIBS}) +qt5_use_modules(json_tool Widgets Gui Core) +target_link_libraries(json_tool ${STAR_EXT_LIBS}) -SET (CMAKE_AUTOMOC OFF) -SET (CMAKE_INCLUDE_CURRENT_DIR OFF) +set(CMAKE_AUTOMOC OFF) +set(CMAKE_INCLUDE_CURRENT_DIR OFF) diff --git a/source/mod_uploader/CMakeLists.txt b/source/mod_uploader/CMakeLists.txt index b80feac..6036037 100644 --- a/source/mod_uploader/CMakeLists.txt +++ b/source/mod_uploader/CMakeLists.txt @@ -1,32 +1,32 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_BASE_INCLUDES} ) -FIND_PACKAGE (Qt5Core) -FIND_PACKAGE (Qt5Widgets) +find_package(Qt5Core) +find_package(Qt5Widgets) -SET (CMAKE_INCLUDE_CURRENT_DIR ON) -SET (CMAKE_AUTOMOC ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) -SET (star_mod_uploader_HEADERS +set(star_mod_uploader_HEADERS StarStringConversion.hpp StarModUploader.hpp StarSPlainTextEdit.hpp ) -SET (star_mod_uploader_SOURCES +set(star_mod_uploader_SOURCES StarModUploader.cpp StarSPlainTextEdit.cpp main.cpp ) -ADD_EXECUTABLE (mod_uploader WIN32 +add_executable(mod_uploader WIN32 $ $ $ ${star_mod_uploader_HEADERS} ${star_mod_uploader_SOURCES}) -QT5_USE_MODULES (mod_uploader Core Gui Widgets) -TARGET_LINK_LIBRARIES (mod_uploader ${STAR_EXT_LIBS} ${STEAM_API_LIBRARY}) +qt5_use_modules(mod_uploader Core Gui Widgets) +target_link_libraries(mod_uploader ${STAR_EXT_LIBS} ${STEAM_API_LIBRARY}) -SET (CMAKE_AUTOMOC OFF) -SET (CMAKE_INCLUDE_CURRENT_DIR OFF) +set(CMAKE_AUTOMOC OFF) +set(CMAKE_INCLUDE_CURRENT_DIR OFF) diff --git a/source/platform/CMakeLists.txt b/source/platform/CMakeLists.txt index edab1a2..e4e1286 100644 --- a/source/platform/CMakeLists.txt +++ b/source/platform/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_PLATFORM_INCLUDES} ) -SET (star_platform_HEADERS +set(star_platform_HEADERS StarP2PNetworkingService.hpp StarStatisticsService.hpp StarUserGeneratedContentService.hpp diff --git a/source/rendering/CMakeLists.txt b/source/rendering/CMakeLists.txt index d45153a..bf31f07 100644 --- a/source/rendering/CMakeLists.txt +++ b/source/rendering/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_BASE_INCLUDES} @@ -8,7 +8,7 @@ INCLUDE_DIRECTORIES ( ${STAR_RENDERING_INCLUDES} ) -SET (star_rendering_HEADERS +set(star_rendering_HEADERS StarAnchorTypes.hpp StarAssetTextureGroup.hpp StarDrawablePainter.hpp @@ -20,7 +20,7 @@ SET (star_rendering_HEADERS StarWorldPainter.hpp ) -SET (star_rendering_SOURCES +set(star_rendering_SOURCES StarAnchorTypes.cpp StarAssetTextureGroup.cpp StarDrawablePainter.cpp @@ -32,4 +32,4 @@ SET (star_rendering_SOURCES StarWorldPainter.cpp ) -ADD_LIBRARY (star_rendering OBJECT ${star_rendering_SOURCES} ${star_rendering_HEADERS}) +add_library(star_rendering OBJECT ${star_rendering_SOURCES} ${star_rendering_HEADERS}) diff --git a/source/server/CMakeLists.txt b/source/server/CMakeLists.txt index d6a22e6..c056563 100644 --- a/source/server/CMakeLists.txt +++ b/source/server/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_BASE_INCLUDES} @@ -6,20 +6,20 @@ INCLUDE_DIRECTORIES ( ${STAR_GAME_INCLUDES} ) -SET (star_server_HEADERS +set(star_server_HEADERS StarServerQueryThread.hpp StarServerRconClient.hpp StarServerRconThread.hpp ) -SET (star_server_SOURCES +set(star_server_SOURCES StarServerQueryThread.cpp StarServerRconClient.cpp StarServerRconThread.cpp main.cpp ) -ADD_EXECUTABLE (starbound_server +add_executable(starbound_server $ $ $ $ ${star_server_HEADERS} ${star_server_SOURCES}) -TARGET_LINK_LIBRARIES (starbound_server ${STAR_EXT_LIBS}) +target_link_libraries(starbound_server ${STAR_EXT_LIBS}) diff --git a/source/test/CMakeLists.txt b/source/test/CMakeLists.txt index fdbea13..1ca51d0 100644 --- a/source/test/CMakeLists.txt +++ b/source/test/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_BASE_INCLUDES} @@ -7,9 +7,9 @@ INCLUDE_DIRECTORIES ( ) # Add top-level test directory so gtest-all.cc can find its own include file -INCLUDE_DIRECTORIES (.) +include_directories(.) -SET (star_core_tests_SOURCES +set(star_core_tests_SOURCES gtest/gtest-all.cc core_tests_main.cpp @@ -55,13 +55,13 @@ SET (star_core_tests_SOURCES variant_test.cpp vlq_test.cpp ) -ADD_EXECUTABLE (core_tests +add_executable(core_tests $ $ ${star_core_tests_SOURCES}) -TARGET_LINK_LIBRARIES (core_tests ${STAR_EXT_LIBS}) -ADD_TEST (NAME core_tests WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/core_tests) +target_link_libraries(core_tests ${STAR_EXT_LIBS}) +add_test(NAME core_tests WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/core_tests) -SET (star_game_tests_SOURCES +set(star_game_tests_SOURCES gtest/gtest-all.cc game_tests_main.cpp @@ -78,8 +78,8 @@ SET (star_game_tests_SOURCES world_geometry_test.cpp universe_connection_test.cpp ) -ADD_EXECUTABLE (game_tests +add_executable(game_tests $ $ $ $ ${star_game_tests_SOURCES}) -TARGET_LINK_LIBRARIES (game_tests ${STAR_EXT_LIBS}) -ADD_TEST (NAME game_tests WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/game_tests) +target_link_libraries(game_tests ${STAR_EXT_LIBS}) +add_test(NAME game_tests WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/game_tests) diff --git a/source/utility/CMakeLists.txt b/source/utility/CMakeLists.txt index 4047ff8..0c26fc9 100644 --- a/source/utility/CMakeLists.txt +++ b/source/utility/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_BASE_INCLUDES} @@ -6,72 +6,72 @@ INCLUDE_DIRECTORIES ( ${STAR_GAME_INCLUDES} ) -ADD_EXECUTABLE (asset_packer +add_executable(asset_packer $ $ $ asset_packer.cpp) -TARGET_LINK_LIBRARIES (asset_packer ${STAR_EXT_LIBS}) +target_link_libraries(asset_packer ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (asset_unpacker +add_executable(asset_unpacker $ $ $ asset_unpacker.cpp) -TARGET_LINK_LIBRARIES (asset_unpacker ${STAR_EXT_LIBS}) +target_link_libraries(asset_unpacker ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (dump_versioned_json +add_executable(dump_versioned_json $ $ $ $ dump_versioned_json.cpp) -TARGET_LINK_LIBRARIES (dump_versioned_json ${STAR_EXT_LIBS}) +target_link_libraries(dump_versioned_json ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (game_repl +add_executable(game_repl $ $ $ $ game_repl.cpp) -TARGET_LINK_LIBRARIES (game_repl ${STAR_EXT_LIBS}) +target_link_libraries(game_repl ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (make_versioned_json +add_executable(make_versioned_json $ $ $ $ make_versioned_json.cpp) -TARGET_LINK_LIBRARIES (make_versioned_json ${STAR_EXT_LIBS}) +target_link_libraries(make_versioned_json ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (planet_mapgen +add_executable(planet_mapgen $ $ $ $ planet_mapgen.cpp) -TARGET_LINK_LIBRARIES (planet_mapgen ${STAR_EXT_LIBS}) +target_link_libraries(planet_mapgen ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (render_terrain_selector +add_executable(render_terrain_selector $ $ $ $ render_terrain_selector.cpp) -TARGET_LINK_LIBRARIES (render_terrain_selector ${STAR_EXT_LIBS}) +target_link_libraries(render_terrain_selector ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (update_tilesets +add_executable(update_tilesets $ $ $ $ update_tilesets.cpp tileset_updater.cpp) -TARGET_LINK_LIBRARIES (update_tilesets ${STAR_EXT_LIBS}) +target_link_libraries(update_tilesets ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (fix_embedded_tilesets +add_executable(fix_embedded_tilesets $ $ $ $ fix_embedded_tilesets.cpp) -TARGET_LINK_LIBRARIES (fix_embedded_tilesets ${STAR_EXT_LIBS}) +target_link_libraries(fix_embedded_tilesets ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (world_benchmark +add_executable(world_benchmark $ $ $ $ world_benchmark.cpp) -TARGET_LINK_LIBRARIES (world_benchmark ${STAR_EXT_LIBS}) +target_link_libraries(world_benchmark ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (generation_benchmark +add_executable(generation_benchmark $ $ $ $ generation_benchmark.cpp) -TARGET_LINK_LIBRARIES (generation_benchmark ${STAR_EXT_LIBS}) +target_link_libraries(generation_benchmark ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (dungeon_generation_benchmark +add_executable(dungeon_generation_benchmark $ $ $ $ dungeon_generation_benchmark.cpp) -TARGET_LINK_LIBRARIES (dungeon_generation_benchmark ${STAR_EXT_LIBS}) +target_link_libraries(dungeon_generation_benchmark ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (map_grep +add_executable(map_grep $ $ $ $ map_grep.cpp) -TARGET_LINK_LIBRARIES (map_grep ${STAR_EXT_LIBS}) +target_link_libraries(map_grep ${STAR_EXT_LIBS}) -ADD_EXECUTABLE (word_count +add_executable(word_count $ $ $ $ word_count.cpp) -TARGET_LINK_LIBRARIES (word_count ${STAR_EXT_LIBS}) +target_link_libraries(word_count ${STAR_EXT_LIBS}) diff --git a/source/windowing/CMakeLists.txt b/source/windowing/CMakeLists.txt index 18e035d..6801d55 100644 --- a/source/windowing/CMakeLists.txt +++ b/source/windowing/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES ( +include_directories( ${STAR_EXTERN_INCLUDES} ${STAR_CORE_INCLUDES} ${STAR_BASE_INCLUDES} @@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES ( ${STAR_WINDOWING_INCLUDES} ) -SET (star_windowing_HEADERS +set(star_windowing_HEADERS StarButtonGroup.hpp StarButtonWidget.hpp StarCanvasWidget.hpp @@ -41,7 +41,7 @@ SET (star_windowing_HEADERS StarWidgetParsing.hpp ) -SET (star_windowing_SOURCES +set(star_windowing_SOURCES StarButtonGroup.cpp StarButtonWidget.cpp StarCanvasWidget.cpp @@ -73,4 +73,4 @@ SET (star_windowing_SOURCES StarWidgetParsing.cpp ) -ADD_LIBRARY (star_windowing OBJECT ${star_windowing_SOURCES} ${star_windowing_HEADERS}) +add_library(star_windowing OBJECT ${star_windowing_SOURCES} ${star_windowing_HEADERS})