[Freeorion-programmers] SF.net SVN: freeorion:[6016] trunk/FreeOrion
|
From: <geoffthemedio@us...> - 2013-05-10 05:43:02
|
Revision: 6016
http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=6016&view=rev
Author: geoffthemedio
Date: 2013-05-10 05:42:54 +0000 (Fri, 10 May 2013)
Log Message:
-----------
Patch by adrian_broher, with MSVC project file tweak by me, simplifying to combined GG and FO build process with the CMake build files.
Modified Paths:
--------------
trunk/FreeOrion/CMakeLists.txt
trunk/FreeOrion/GG/CMakeLists.txt
trunk/FreeOrion/GG/GG/PluginInterface.h
trunk/FreeOrion/GG/src/CMakeLists.txt
trunk/FreeOrion/GG/src/Ogre/CMakeLists.txt
trunk/FreeOrion/GG/src/SDL/CMakeLists.txt
trunk/FreeOrion/client/AI/CMakeLists.txt
trunk/FreeOrion/client/human/CMakeLists.txt
trunk/FreeOrion/cmake/FindGiGi.cmake
trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj
trunk/FreeOrion/server/CMakeLists.txt
Modified: trunk/FreeOrion/CMakeLists.txt
===================================================================
--- trunk/FreeOrion/CMakeLists.txt 2013-05-08 17:08:00 UTC (rev 6015)
+++ trunk/FreeOrion/CMakeLists.txt 2013-05-10 05:42:54 UTC (rev 6016)
@@ -81,13 +81,6 @@
message(FATAL_ERROR "ZLib library not found.")
endif ()
-find_package(GiGi)
-if (GIGI_FOUND)
- include_directories(${GIGI_INCLUDE_DIR})
-else ()
- message(FATAL_ERROR "GiGi library not found.")
-endif ()
-
find_package(OpenGL REQUIRED)
if(OPENGL_FOUND)
include_directories(${OPENGL_INCLUDE_DIR})
@@ -125,8 +118,11 @@
########################################
# Build common code library #
########################################
-include_directories(${CMAKE_SOURCE_DIR} log4cpp OpenSteer/include)
+set(BUILD_SDL_DRIVER CACHE INTERNAL "Disable building of SDL driver." FORCE)
+add_subdirectory(GG)
+include_directories(${CMAKE_SOURCE_DIR} GG log4cpp OpenSteer/include)
+
add_definitions(-DADOBE_STD_SERIALIZATION)
if (FREEORION_RELEASE)
Modified: trunk/FreeOrion/GG/CMakeLists.txt
===================================================================
--- trunk/FreeOrion/GG/CMakeLists.txt 2013-05-08 17:08:00 UTC (rev 6015)
+++ trunk/FreeOrion/GG/CMakeLists.txt 2013-05-10 05:42:54 UTC (rev 6016)
@@ -139,7 +139,7 @@
add_definitions(-DADOBE_STD_SERIALIZATION)
-include_directories(${CMAKE_HOME_DIRECTORY})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libltdl)
########################################
@@ -211,16 +211,16 @@
########################################
# Header Generation #
########################################
-if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h)
+if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libltdl/config.h)
if (UNIX)
message("-- Configuring libltdl using \"libltdl/configure\" ...")
execute_process(
- COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure
- WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/libltdl/configure
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/libltdl
OUTPUT_QUIET
)
else ()
- file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h
+ file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/libltdl/config.h
"/* WARNING: Generated by GG's build system. All local changes will be lost! */
#define error_t int
#define HAVE_STDIO_H 1
@@ -242,8 +242,8 @@
endif ()
configure_file(
- ${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in
- ${CMAKE_HOME_DIRECTORY}/GG/Config.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.h.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/GG/Config.h
@ONLY
)
@@ -265,6 +265,24 @@
########################################
# Recurse Into Sources #
########################################
+find_package (Threads)
+
+add_library(ltdl STATIC libltdl/ltdl.c)
+set_source_files_properties(
+ libltdl/ltdl.c
+ PROPERTIES
+ COMPILE_DEFINITIONS HAVE_CONFIG_H=1
+)
+if (CMAKE_COMPILER_IS_GNUCXX)
+ set_source_files_properties(
+ libltdl/ltdl.c
+ PROPERTIES
+ COMPILE_FLAGS -fPIC
+ )
+endif ()
+
+target_link_libraries(ltdl ${CMAKE_THREAD_LIBS_INIT})
+
add_subdirectory(src)
if (BUILD_TESTS)
@@ -321,7 +339,7 @@
set(CPACK_PACKAGE_VENDOR "T. Zachary Laine")
set(CPACK_PACKAGE_CONTACT ${CPACK_PACKAGE_VENDOR})
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A C++ OpenGL GUI library.")
-set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_HOME_DIRECTORY}/COPYING)
+set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING)
if (NOT ${PACKAGE_TYPE} STREQUAL NoPackage)
set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
if (${PACKAGE_TYPE} STREQUAL Full)
Modified: trunk/FreeOrion/GG/GG/PluginInterface.h
===================================================================
--- trunk/FreeOrion/GG/GG/PluginInterface.h 2013-05-08 17:08:00 UTC (rev 6015)
+++ trunk/FreeOrion/GG/GG/PluginInterface.h 2013-05-10 05:42:54 UTC (rev 6016)
@@ -35,7 +35,7 @@
#if defined(__APPLE__) && defined(__MACH__)
# include "../libltdl/ltdl.h"
#else
-# include <GG/ltdl.h>
+# include <ltdl.h>
#endif
#include <string>
Modified: trunk/FreeOrion/GG/src/CMakeLists.txt
===================================================================
--- trunk/FreeOrion/GG/src/CMakeLists.txt 2013-05-08 17:08:00 UTC (rev 6015)
+++ trunk/FreeOrion/GG/src/CMakeLists.txt 2013-05-10 05:42:54 UTC (rev 6016)
@@ -50,8 +50,6 @@
dialogs/FileDlg.cpp
dialogs/ThreeButtonDlg.cpp
- ../libltdl/ltdl.c
-
adobe/adam.cpp
adobe/adam_evaluate.cpp
adobe/adam_parser.cpp
@@ -162,13 +160,6 @@
)
endif ()
-set_source_files_properties(${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.c PROPERTIES COMPILE_DEFINITIONS HAVE_CONFIG_H=1)
-execute_process(
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl.h
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/config.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h
-)
-set_source_files_properties(${CMAKE_HOME_DIRECTORY}/GG/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h PROPERTIES GENERATED true)
-
set(GiGi_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES})
if (USE_DEVIL)
list(APPEND GiGi_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})
@@ -201,7 +192,7 @@
)
endif ()
-target_link_libraries(GiGi ${GiGi_LINK_LIBS})
+target_link_libraries(GiGi ltdl ${GiGi_LINK_LIBS})
# Installation of this library variant
if (((NOT BUILD_SHARED_LIBS AND NOT RUNTIME_ONLY_PACKAGE) OR
@@ -216,7 +207,7 @@
if (UNIX)
get_pkg_config_libs(pkg_config_libs ${GiGi_LINK_LIBS})
configure_file(
- ${CMAKE_HOME_DIRECTORY}/cmake/GiGi.pc.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/GiGi.pc.in
${CMAKE_BINARY_DIR}/GiGi.pc
@ONLY
)
Modified: trunk/FreeOrion/GG/src/Ogre/CMakeLists.txt
===================================================================
--- trunk/FreeOrion/GG/src/Ogre/CMakeLists.txt 2013-05-08 17:08:00 UTC (rev 6015)
+++ trunk/FreeOrion/GG/src/Ogre/CMakeLists.txt 2013-05-10 05:42:54 UTC (rev 6016)
@@ -46,7 +46,7 @@
if (UNIX)
get_pkg_config_libs(pkg_config_libs ${GiGiOgre_LINK_LIBS})
configure_file(
- ${CMAKE_HOME_DIRECTORY}/cmake/GiGiOgre.pc.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/GiGiOgre.pc.in
${CMAKE_BINARY_DIR}/GiGiOgre.pc
@ONLY
)
Modified: trunk/FreeOrion/GG/src/SDL/CMakeLists.txt
===================================================================
--- trunk/FreeOrion/GG/src/SDL/CMakeLists.txt 2013-05-08 17:08:00 UTC (rev 6015)
+++ trunk/FreeOrion/GG/src/SDL/CMakeLists.txt 2013-05-10 05:42:54 UTC (rev 6016)
@@ -41,7 +41,7 @@
if (UNIX)
get_pkg_config_libs(pkg_config_libs ${GiGiSDL_LINK_LIBS})
configure_file(
- ${CMAKE_HOME_DIRECTORY}/cmake/GiGiSDL.pc.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/GiGiSDL.pc.in
${CMAKE_BINARY_DIR}/GiGiSDL.pc
@ONLY
)
Modified: trunk/FreeOrion/client/AI/CMakeLists.txt
===================================================================
--- trunk/FreeOrion/client/AI/CMakeLists.txt 2013-05-08 17:08:00 UTC (rev 6015)
+++ trunk/FreeOrion/client/AI/CMakeLists.txt 2013-05-10 05:42:54 UTC (rev 6016)
@@ -22,7 +22,13 @@
add_definitions(-DFREEORION_BUILD_AI)
-set(freeorionca_LINK_LIBS core parse log4cpp ${PYTHON_LIBRARIES})
+set(freeorionca_LINK_LIBS
+ core
+ parse
+ log4cpp
+ GiGi # needed for adobe name_t implementation
+ ${PYTHON_LIBRARIES}
+)
if (WIN32)
link_directories(${BOOST_LIBRARYDIR})
Modified: trunk/FreeOrion/client/human/CMakeLists.txt
===================================================================
--- trunk/FreeOrion/client/human/CMakeLists.txt 2013-05-08 17:08:00 UTC (rev 6015)
+++ trunk/FreeOrion/client/human/CMakeLists.txt 2013-05-10 05:42:54 UTC (rev 6016)
@@ -125,9 +125,9 @@
parse
log4cpp
pagedgeometry
- ${GIGI_GIGI_LIBRARY}
- ${GIGI_GIGIOGRE_LIBRARY}
- ${GIGI_GIGIOGREOIS_LIBRARY}
+ GiGi
+ GiGiOgre
+ GiGiOgrePlugin_OIS
${OPENAL_LIBRARY}
${ALUT_LIBRARY}
${OGRE_LIBRARIES}
Modified: trunk/FreeOrion/cmake/FindGiGi.cmake
===================================================================
--- trunk/FreeOrion/cmake/FindGiGi.cmake 2013-05-08 17:08:00 UTC (rev 6015)
+++ trunk/FreeOrion/cmake/FindGiGi.cmake 2013-05-10 05:42:54 UTC (rev 6016)
@@ -1,65 +1,65 @@
# - Try to find GiGi
# Once done this will define
#
-# GIGI_FOUND - system has GiGi
-# GIGI_INCLUDE_DIR
-# GIGI_LIBRARIES
+# GiGi_FOUND - system has GiGi
+# GiGi_INCLUDE_DIR
+# GiGi_LIBRARIES
#
# $GIGIDIR is an environment variable that may be set to guide CMake in
# finding GiGi.
find_package(PkgConfig)
if (GIGIDIR)
- set(GIGI_INCLUDE_DIRS ${GIGIDIR})
- set(GIGI_LIBRARY_DIRS ${GIGIDIR})
+ set(GiGi_INCLUDE_DIRS ${GIGIDIR})
+ set(GiGi_LIBRARY_DIRS ${GIGIDIR})
else ()
if (PKG_CONFIG_FOUND)
- pkg_check_modules(GIGI GiGi)
- if (GIGI_FOUND)
- set(GIGI_INCLUDE_DIR ${GIGI_INCLUDE_DIRS})
- endif ()
- endif ()
+ pkg_check_modules(GiGi GiGi)
+ if (GiGi_FOUND)
+ set(GiGi_INCLUDE_DIR ${GiGi_INCLUDE_DIRS})
+ endif ()
+ endif ()
endif ()
find_path(
- GIGI_INCLUDE_DIR
+ GiGi_INCLUDE_DIR
NAMES GG/GUI.h
- HINTS ${GIGI_INCLUDE_DIRS}
+ HINTS ${GiGi_INCLUDE_DIRS}
)
find_library(
- GIGI_GIGI_LIBRARY
+ GiGi_GIGI_LIBRARY
NAMES GiGi
- HINTS ${GIGI_LIBRARY_DIRS}
+ HINTS ${GiGi_LIBRARY_DIRS}
)
find_library(
- GIGI_GIGISDL_LIBRARY
+ GiGi_GIGISDL_LIBRARY
NAMES GiGiSDL
- HINTS ${GIGI_LIBRARY_DIRS}
+ HINTS ${GiGi_LIBRARY_DIRS}
)
find_library(
- GIGI_GIGIOGRE_LIBRARY
+ GiGi_GIGIOGRE_LIBRARY
NAMES GiGiOgre
- HINTS ${GIGI_LIBRARY_DIRS}
+ HINTS ${GiGi_LIBRARY_DIRS}
)
find_library(
- GIGI_GIGIOGREOIS_LIBRARY
+ GiGi_GIGIOGREOIS_LIBRARY
NAMES GiGiOgrePlugin_OIS
- HINTS ${GIGI_LIBRARY_DIRS}
+ HINTS ${GiGi_LIBRARY_DIRS}
)
-if (GIGI_INCLUDE_DIR AND
- GIGI_GIGI_LIBRARY)
- set(GIGI_FOUND true)
- set(GIGI_LIBRARIES ${GIGI_GIGI_LIBRARY})
- if (GIGI_GIGISDL_LIBRARY)
- set(GIGI_LIBRARIES ${GIGI_LIBRARIES} ${GIGI_GIGISDL_LIBRARY})
+if (GiGi_INCLUDE_DIR AND
+ GiGi_GIGI_LIBRARY)
+ set(GiGi_FOUND true)
+ set(GiGi_LIBRARIES ${GiGi_GIGI_LIBRARY})
+ if (GiGi_GIGISDL_LIBRARY)
+ set(GiGi_LIBRARIES ${GiGi_LIBRARIES} ${GiGi_GIGISDL_LIBRARY})
endif ()
- if (GIGI_GIGIOGRE_LIBRARY)
- set(GIGI_LIBRARIES ${GIGI_LIBRARIES} ${GIGI_GIGIOGRE_LIBRARY})
+ if (GiGi_GIGIOGRE_LIBRARY)
+ set(GiGi_LIBRARIES ${GiGi_LIBRARIES} ${GiGi_GIGIOGRE_LIBRARY})
endif ()
- if (GIGI_GIGIOGREOIS_LIBRARY)
- set(GIGI_LIBRARIES ${GIGI_LIBRARIES} ${GIGI_GIGIOGREOIS_LIBRARY})
+ if (GiGi_GIGIOGREOIS_LIBRARY)
+ set(GiGi_LIBRARIES ${GiGi_LIBRARIES} ${GiGi_GIGIOGREOIS_LIBRARY})
endif ()
else ()
- set(GIGI_FOUND false)
+ set(GiGi_FOUND false)
endif ()
Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj
===================================================================
--- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2013-05-08 17:08:00 UTC (rev 6015)
+++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2013-05-10 05:42:54 UTC (rev 6016)
@@ -194,7 +194,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_DLL;GiGi_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>../include/;../../../include;../../../include/libpng/;../../../include/zlib/;../../GG/;../../../Boost/include/boost_1_51/</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include/;../../../include;../../../include/libpng/;../../../include/zlib/;../../GG/;../../../Boost/include/boost_1_51/;../../GG/libltdl/</AdditionalIncludeDirectories>
<CompileAsManaged>false</CompileAsManaged>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
Modified: trunk/FreeOrion/server/CMakeLists.txt
===================================================================
--- trunk/FreeOrion/server/CMakeLists.txt 2013-05-08 17:08:00 UTC (rev 6015)
+++ trunk/FreeOrion/server/CMakeLists.txt 2013-05-10 05:42:54 UTC (rev 6016)
@@ -27,6 +27,7 @@
core
parse
log4cpp
+ GiGi # needed for adobe name_t implementation
${CMAKE_THREAD_LIBS_INIT}
)
|