some cmake hackery to choose static libs for everything but openAL/GL

renefritze · Dec 4, 2011 · 53265d2 · 53265d2
1 parent fc477c4
commit 53265d2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,14 @@
 
 project(Spring)
 
+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a" )
+function (FIND_PACKAGE_EXTRA ARGV )
+	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so" )
+	FIND_PACKAGE( ${ARGV} )
+	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a" )
+endfunction (FIND_PACKAGE_EXTRA )
+SET(CMAKE_CXX_FLAGS "-fPIC" )
+
 # CMake 2.4:
 # - lacks some cross-compiling features and fails on windows
 # CMake 2.6:

diff --git a/rts/System/Sound/CMakeLists.txt b/rts/System/Sound/CMakeLists.txt
@@ -39,7 +39,7 @@ if    (NOT NO_SOUND)
 			VorbisShared
 		)
 
-	FIND_PACKAGE(OpenAL REQUIRED)
+	FIND_PACKAGE_EXTRA(OpenAL REQUIRED)
 	INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
 	FIND_PACKAGE(OggVorbis REQUIRED)
 

diff --git a/rts/builds/default/CMakeLists.txt b/rts/builds/default/CMakeLists.txt
@@ -13,7 +13,7 @@ FIND_PACKAGE(SDL REQUIRED)
 INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
 LIST(APPEND engineLibraries ${SDL_LIBRARY})
 
-FIND_PACKAGE(OpenGL REQUIRED)
+FIND_PACKAGE_EXTRA(OpenGL REQUIRED)
 FIND_PACKAGE(GLU REQUIRED)
 FIND_PACKAGE(GLEW 1.5.1 REQUIRED)
 LIST(APPEND engineLibraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES})

diff --git a/rts/builds/multithreaded/CMakeLists.txt b/rts/builds/multithreaded/CMakeLists.txt
@@ -26,7 +26,7 @@ FIND_PACKAGE(SDL REQUIRED)
 INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
 LIST(APPEND engineLibraries ${SDL_LIBRARY})
 
-FIND_PACKAGE(OpenGL REQUIRED)
+FIND_PACKAGE_EXTRA(OpenGL REQUIRED)
 FIND_PACKAGE(GLU REQUIRED)
 FIND_PACKAGE(GLEW 1.5.1 REQUIRED)
 LIST(APPEND engineLibraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES})