File AtomicWorm_CmakeLists.diff of Package AtomicWorm

Overview Repositories Revisions Requests Users Attributes Meta

File AtomicWorm_CmakeLists.diff of Package AtomicWorm

--- AtomicWorm_019_src/CMakeLists.txt_orig	2018-07-26 01:33:10.591534899 +0200
+++ AtomicWorm_019_src/CMakeLists.txt	2018-07-28 18:33:30.832099086 +0200
@@ -4,33 +4,12 @@
 SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -m32")
 SET(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O3 -m32")
 
-SET(CMAKE_MODULE_PATH "${atomicworm_SOURCE_DIR}/CMakeModules" )
-
-INCLUDE(FindImageMagick)
-INCLUDE(FindSDL)
-INCLUDE(FindOpenGL)
-INCLUDE(FindSDL_mixer)
-INCLUDE(FindPythonLibs)
-
-Find_Package ( SDL REQUIRED )
-Find_Package ( SDL_mixer REQUIRED )
-Find_Package ( ImageMagick REQUIRED )
-Find_Package ( OpenGL REQUIRED )
-
-FIND_PACKAGE(ImageMagickLib)
-
-SET(MY_LINK_LIBS    
-   ${SDL_LIBRARY}
-   ${SDLMIXER_LIBRARY}
-   ${OPENGL_LIBRARIES}
-   ${IMAGEMAGICKLIB_LIBRARIES} 
-   ${IMAGEMAGICKLIB_CXX_LIBRARIES} 
-)
+Find_Package ( SDL2 REQUIRED )
+Find_Package ( PythonLibs REQUIRED )
 
 IF (PYTHON_LIBRARIES)
      MESSAGE("Python development libraries found, building TuxCap Python bindings and examples")   
      MESSAGE("Python libraries ${PYTHON_LIBRARIES} include path ${PYTHON_INCLUDE_PATH}")   
-     SET(MY_LINK_LIBS    ${MY_LINK_LIBS} ${PYTHON_LIBRARIES})       
 ELSE (PYTHON_LIBRARIES)
      MESSAGE("No Python development libraries found, skipping building of TuxCap Python bindings")   
 ENDIF (PYTHON_LIBRARIES)
@@ -39,36 +18,18 @@
 src
 )
 
-link_libraries (
-        ${MY_LINK_LIBS}
-)
+link_libraries ()
 
-IF(SDL_FOUND)
-MESSAGE("libSDL found. ${SDL_INCLUDE_DIR} ${SDL_LIBRARY}")
-ELSE(SDL_FOUND)
-MESSAGE(FATAL_ERROR "libSDL requested but not found.")
-ENDIF(SDL_FOUND)
-
-IF(IMAGEMAGICKLIB_FOUND)
-MESSAGE("lib ImageMagick found. ${IMAGEMAGICKLIB_INCLUDE_DIR} ${IMAGEMAGICKLIB_LIBRARIES} ${IMAGEMAGICKLIB_CXX_LIBRARIES}")
-ELSE(IMAGEMAGICKLIB_FOUND)
-MESSAGE(FATAL_ERROR "lib ImageMagick requested but not found.")
-ENDIF(IMAGEMAGICKLIB_FOUND)
-
-IF(SDLMIXER_FOUND)
-MESSAGE("libSDL_mixer found. ${SDLMIXER_INCLUDE_DIR} ${SDLMIXER_LIBRARY}")
-ELSE(SDLMIXER_FOUND)
-MESSAGE(FATAL_ERROR "libSDL_mixer requested but not found.")
-ENDIF(SDLMIXER_FOUND)
-
-IF(OPENGL_FOUND)
-MESSAGE("OpenGL found. ${OPENGL_INCLUDE_DIR} ${OPENGL_LIBRARIES}")
-ELSE(OPENGL_FOUND)
-MESSAGE(FATAL_ERROR "OpenGL requested but not found.")
-ENDIF(OPENGL_FOUND)
+IF(SDL2_FOUND)
+MESSAGE("libSDL2 found. '${SDL2_INCLUDE_DIRS}' '${SDL2_LIBRARIES}'")
+ELSE(SDL2_FOUND)
+MESSAGE(FATAL_ERROR "libSDL2 requested but not found.")
+ENDIF(SDL2_FOUND)
 
 SET ( MY_INCLUDE_DIRS  
-{SDL_INCLUDE_DIR} ${IMAGEMAGICKLIB_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} /usr/include/tuxcap)
+   ${SDL2_INCLUDE_DIRS}
+   ${PYTHON_INCLUDE_PATH}
+   /usr/include/tuxcap)
 
 INCLUDE_DIRECTORIES ( ${MY_INCLUDE_DIRS} )

Places

File AtomicWorm_CmakeLists.diff of Package AtomicWorm

Places