fix up CMake files

fix SDL2 example build on gcc
fallahn · Mar 15, 2024 · 90b15af · 90b15af
1 parent 7ff665b
commit 90b15af
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/SDL2Example/CMakeLists.txt b/SDL2Example/CMakeLists.txt
@@ -22,7 +22,7 @@ endif()
 SET (CMAKE_CXX_FLAGS_DEBUG "-g -D_DEBUG_")
 SET (CMAKE_CXX_FLAGS_RELEASE "-O4 -DNDEBUG")
 
-find_package(tmxlite REQUIRED)
+find_package(TMXLITE REQUIRED)
 find_package(SDL2 REQUIRED)
 
 include_directories(
@@ -50,4 +50,4 @@ install(TARGETS ${PROJECT_NAME}
 
 #install game data
 install(DIRECTORY assets
- DESTINATION .)
+ DESTINATION .)
diff --git a/SDL2Example/cmake/modules/FindTMXLITE.cmake b/SDL2Example/cmake/modules/FindTMXLITE.cmake
@@ -1,10 +1,10 @@
-include(FindPackageHandleStandardArgs)
-
-# Search for the header file
 find_path(TMXLITE_INCLUDE_DIR NAMES tmxlite/Config.hpp PATH_SUFFIXES include)
 
-# Search for the library
-find_library(TMXLITE_LIBRARIES NAMES tmxlite PATH_SUFFIXES lib)
+find_library(TMXLITE_LIBRARY_DEBUG NAMES tmxlite-d)
+find_library(TMXLITE_LIBRARY_RELEASE NAMES tmxlite)
 
-# Did we find everything we need?
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(tmxlite DEFAULT_MSG TMXLITE_LIBRARIES TMXLITE_INCLUDE_DIR) 
+include(SelectLibraryConfigurations)
+select_library_configurations(TMXLITE)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TMXLITE DEFAULT_MSG TMXLITE_LIBRARY TMXLITE_INCLUDE_DIR)
diff --git a/SDL2Example/src/Texture.cpp b/SDL2Example/src/Texture.cpp
@@ -31,6 +31,7 @@ source distribution.
 #include "stb_image.h"
 
 #include <iostream>
+#include <cstdint>
 
 Texture::Texture()
  : m_texture(nullptr)
@@ -96,4 +97,4 @@ bool Texture::loadFromFile(const std::string& path, SDL_Renderer* renderer)
  }
 
  return false;
-}
+}
diff --git a/SFMLExample/CMakeLists.txt b/SFMLExample/CMakeLists.txt
@@ -22,7 +22,7 @@ endif()
 SET (CMAKE_CXX_FLAGS_DEBUG "-g -D_DEBUG_")
 SET (CMAKE_CXX_FLAGS_RELEASE "-O4 -DNDEBUG")
 
-find_package(tmxlite REQUIRED)
+find_package(TMXLITE REQUIRED)
 find_package(SFML 2 REQUIRED graphics window system)
 
 include_directories(
@@ -47,4 +47,4 @@ install(TARGETS ${PROJECT_NAME}
 
 #install game data
 install(DIRECTORY assets
- DESTINATION .)
+ DESTINATION .)
diff --git a/SFMLExample/cmake/modules/FindTMXLITE.cmake b/SFMLExample/cmake/modules/FindTMXLITE.cmake
@@ -1,10 +1,10 @@
-include(FindPackageHandleStandardArgs)
-
-# Search for the header file
 find_path(TMXLITE_INCLUDE_DIR NAMES tmxlite/Config.hpp PATH_SUFFIXES include)
 
-# Search for the library
-find_library(TMXLITE_LIBRARIES NAMES tmxlite PATH_SUFFIXES lib)
+find_library(TMXLITE_LIBRARY_DEBUG NAMES tmxlite-d)
+find_library(TMXLITE_LIBRARY_RELEASE NAMES tmxlite)
 
-# Did we find everything we need?
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(tmxlite DEFAULT_MSG TMXLITE_LIBRARIES TMXLITE_INCLUDE_DIR) 
+include(SelectLibraryConfigurations)
+select_library_configurations(TMXLITE)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TMXLITE DEFAULT_MSG TMXLITE_LIBRARY TMXLITE_INCLUDE_DIR)