Modifying the CMake a bit

CMakeLists.txt

@@ -33,6 +33,9 @@ ENDMACRO()
 #
 SET(ARCH 64 CACHE STRING "The architecture")
 
+SET(CMAKE_CXX_FLAGS -m${ARCH})
+SET(CMAKE_EXE_LINKER_FLAGS -m${ARCH})
+
 #
 # Install
 #
@@ -43,11 +46,14 @@ SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Library install pa
 # SVN
 #
 FIND_PACKAGE(Subversion 1.6 REQUIRED)
+
 IF(Subversion_FOUND)
 	Subversion_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} ER)
 	ADD_DEFINITIONS("-DANKI_REVISION=${ER_WC_REVISION}")
+	SET(ANKI_REVISION ${ER_WC_REVISION})
 ELSE()
 	ADD_DEFINITIONS("-DANKI_REVISION=???")
+	SET(ANKI_REVISION unkown)
 ENDIF()
 
 # 
@@ -75,6 +81,13 @@ ENDIF()
 FIND_PACKAGE(PNG 1.2 REQUIRED)
 FIND_PACKAGE(JPEG 62 REQUIRED)
 
+FIND_PACKAGE(Boost 1.47 REQUIRED)
+SET(Boost_USE_STATIC_LIBS ON)
+IF(Boost_FOUND)
+	INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
+	ADD_DEFINITIONS("-DHAS_BOOST")
+ENDIF()
+
 #
 # Freetype
 #
@@ -108,15 +121,6 @@ SET(GLEW_LIBRARY_DIR "${ANKI_PROJ_SOURCE_DIR}/extern/lib${ARCH}" CACHE PATH "The
 
 ANKI_ADD_LIB(${GLEW_INCLUDE_DIR} ${GLEW_LIBRARY_DIR} ${GLEW_INCLUDE_DIR}/GL/glew.h)
 
-#
-# Boost
-#
-SET(BOOST_INCLUDE_DIR "/usr/include/" CACHE PATH "The directory that contains the boost directory")
-SET(BOOST_LIBRARY_DIR "/usr/lib/" CACHE PATH "The directory that contains the libboost_*.so")
-
-ANKI_ADD_LIB(${BOOST_INCLUDE_DIR} ${BOOST_LIBRARY_DIR} ${BOOST_INCLUDE_DIR}/boost/version.hpp)
-
-
 #
 # Defines & flags
 #
@@ -131,9 +135,9 @@ ELSE()
 ENDIF()
 
 IF(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
-	ADD_DEFINITIONS("-DPLATFORM_LINUX")
+	ADD_DEFINITIONS("-DANKI_PLATFORM_LINUX")
 ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
-	ADD_DEFINITIONS("-DPLATFORM_WINDOWS")
+	ADD_DEFINITIONS("-DANKI_PLATFORM_WINDOWS")
 ENDIF()
 
 ADD_DEFINITIONS("-std=c++0x")

anki/CMakeLists.txt

@@ -1,9 +1,14 @@
-SET(ANKI_LIBS script renderer scene ui event 
+SET(ANKI_SUB_DIRS script renderer scene ui event 
 	input physics resource core misc gl collision math util)
 
-SUBDIRS(${ANKI_LIBS})
+SET(ANKI_LIBS "")
 
-ADD_LIBRARY(anki ${ANKI_LIBS})
+FOREACH(TMP ${ANKI_SUB_DIRS})
+	ADD_SUBDIRECTORY(${TMP})
+	SET(ANKI_LIBS ${ANKI_LIBS} anki${TMP})
+ENDFOREACH()
+
+ADD_LIBRARY(anki)
 
 TARGET_LINK_LIBRARIES(anki ${ANKI_LIBS} BulletSoftBody BulletDynamics 
 	BulletCollision LinearMath GLEWmx GLU GL jpeg SDL png python${PYTHON_VER}
@@ -12,6 +17,8 @@ TARGET_LINK_LIBRARIES(anki ${ANKI_LIBS} BulletSoftBody BulletDynamics
 
 SET_TARGET_PROPERTIES(anki PROPERTIES LINKER_LANGUAGE CXX)
 
+# Install
+#
 INSTALL(TARGETS anki DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(DIRECTORY ${ANKI_PROJECT_SOURCE_DIR}/anki DESTINATION "${INCLUDE_INSTALL_DIR}" FILES_MATCHING PATTERN "*.h" PATTERN .svn EXCLUDE)

anki/collision/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB CLN_SOURCES *.cpp)
-FILE(GLOB CLN_HEADERS *.h)
+FILE(GLOB ANKI_CLN_SOURCES *.cpp)
+FILE(GLOB ANKI_CLN_HEADERS *.h)
 
-ADD_LIBRARY(collision ${CLN_SOURCES} ${CLN_HEADERS})
+ADD_LIBRARY(ankicollision ${ANKI_CLN_SOURCES} ${ANKI_CLN_HEADERS})

anki/core/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB_RECURSE CORE_SOURCES *.cpp)
-FILE(GLOB_RECURSE CORE_HEADERS *.h)
+FILE(GLOB_RECURSE ANKI_CORE_SOURCES *.cpp)
+FILE(GLOB_RECURSE ANKI_CORE_HEADERS *.h)
 
-ADD_LIBRARY(core ${CORE_SOURCES} ${CORE_HEADERS})
+ADD_LIBRARY(ankicore ${ANKI_CORE_SOURCES} ${ANKI_CORE_HEADERS})

anki/event/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB EVENT_SOURCES *.cpp)
-FILE(GLOB EVENT_HEADERS *.h)
+FILE(GLOB ANKI_EVENT_SOURCES *.cpp)
+FILE(GLOB ANKI_EVENT_HEADERS *.h)
 
-ADD_LIBRARY(event ${EVENT_SOURCES} ${EVENT_HEADERS})
+ADD_LIBRARY(ankievent ${ANKI_EVENT_SOURCES} ${ANKI_EVENT_HEADERS})

anki/gl/CMakeLists.txt

@@ -1,6 +1,6 @@
-FILE(GLOB_RECURSE GL_SOURCES *.cpp)
-FILE(GLOB_RECURSE GL_HEADERS *.h)
+FILE(GLOB_RECURSE ANKI_GL_SOURCES *.cpp)
+FILE(GLOB_RECURSE ANKI_GL_HEADERS *.h)
 
 #INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/BufferObjects")
 
-ADD_LIBRARY(gl ${GL_SOURCES} ${GL_HEADERS})
+ADD_LIBRARY(ankigl ${ANKI_GL_SOURCES} ${ANKI_GL_HEADERS})

anki/input/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB I_SOURCES *.cpp)
-FILE(GLOB I_HEADERS *.h)
+FILE(GLOB ANKI_I_SOURCES *.cpp)
+FILE(GLOB ANKI_I_HEADERS *.h)
 
-ADD_LIBRARY(input ${I_SOURCES} ${I_HEADERS})
+ADD_LIBRARY(ankiinput ${ANKI_I_SOURCES} ${ANKI_I_HEADERS})

anki/math/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB M_SOURCES *.cpp)
-FILE(GLOB M_HEADERS *.h)
+FILE(GLOB ANKI_M_SOURCES *.cpp)
+FILE(GLOB ANKI_M_HEADERS *.h)
 
-ADD_LIBRARY(math ${M_SOURCES} ${M_HEADERS})
+ADD_LIBRARY(ankimath ${ANKI_M_SOURCES} ${ANKI_M_HEADERS})

anki/misc/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB MISC_SOURCES *.cpp)
-FILE(GLOB MISC_HEADERS *.h)
+FILE(GLOB ANKI_MISC_SOURCES *.cpp)
+FILE(GLOB ANKI_MISC_HEADERS *.h)
 
-ADD_LIBRARY(misc ${MISC_SOURCES} ${MISC_HEADERS})
+ADD_LIBRARY(ankimisc ${ANKI_MISC_SOURCES} ${ANKI_MISC_HEADERS})

anki/physics/CMakeLists.txt

@@ -1,7 +1,7 @@
-FILE(GLOB PHYS_SOURCES *.cpp)
-FILE(GLOB PHYS_HEADERS *.h)
+FILE(GLOB ANKI_PHYS_SOURCES *.cpp)
+FILE(GLOB ANKI_PHYS_HEADERS *.h)
 
-ADD_LIBRARY(physics ${PHYS_SOURCES} ${PHYS_HEADERS})
+ADD_LIBRARY(ankiphysics ${ANKI_PHYS_SOURCES} ${ANKI_PHYS_HEADERS})
 
-TARGET_LINK_LIBRARIES(physics BulletDynamics 
+TARGET_LINK_LIBRARIES(ankiphysics BulletDynamics 
 	BulletCollision LinearMath)

anki/renderer/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB_RECURSE R_SOURCES *.cpp)
-FILE(GLOB_RECURSE R_HEADERS *.h)
+FILE(GLOB_RECURSE ANKI_R_SOURCES *.cpp)
+FILE(GLOB_RECURSE ANKI_R_HEADERS *.h)
 
-ADD_LIBRARY(renderer ${R_SOURCES} ${R_HEADERS})
+ADD_LIBRARY(ankirenderer ${ANKI_R_SOURCES} ${ANKI_R_HEADERS})

anki/resource/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB_RECURSE RSRC_SOURCES *.cpp)
-FILE(GLOB_RECURSE RSRC_HEADERS *.h)
+FILE(GLOB_RECURSE ANKI_RSRC_SOURCES *.cpp)
+FILE(GLOB_RECURSE ANKI_RSRC_HEADERS *.h)
 
-ADD_LIBRARY(resource ${RSRC_SOURCES} ${RSRC_HEADERS})
+ADD_LIBRARY(ankiresource ${ANKI_RSRC_SOURCES} ${ANKI_RSRC_HEADERS})

anki/scene/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB_RECURSE SCENE_SOURCES *.cpp)
-FILE(GLOB_RECURSE SCENE_HEADERS *.h)
+FILE(GLOB_RECURSE ANKI_SCENE_SOURCES *.cpp)
+FILE(GLOB_RECURSE ANKI_SCENE_HEADERS *.h)
 
-ADD_LIBRARY(scene ${SCENE_SOURCES} ${SCENE_HEADERS})
+ADD_LIBRARY(ankiscene ${ANKI_SCENE_SOURCES} ${ANKI_SCENE_HEADERS})

anki/script/CMakeLists.txt

@@ -1,6 +1,6 @@
-FILE(GLOB_RECURSE SCRIPT_SOURCES *.cpp)
-FILE(GLOB_RECURSE SCRIPT_HEADERS *.h)
+FILE(GLOB_RECURSE ANKI_SCRIPT_SOURCES *.cpp)
+FILE(GLOB_RECURSE ANKI_SCRIPT_HEADERS *.h)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_LIBRARY(script ${SCRIPT_SOURCES} ${SCRIPT_HEADERS})
+ADD_LIBRARY(ankiscript ${ANKI_SCRIPT_SOURCES} ${ANKI_SCRIPT_HEADERS})

anki/ui/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB UI_SOURCES *.cpp)
-FILE(GLOB UI_HEADERS *.h)
+FILE(GLOB ANKI_UI_SOURCES *.cpp)
+FILE(GLOB ANKI_UI_HEADERS *.h)
 
-ADD_LIBRARY(ui ${UI_SOURCES} ${UI_HEADERS})
+ADD_LIBRARY(ankiui ${ANKI_UI_SOURCES} ${ANKI_UI_HEADERS})

anki/util/CMakeLists.txt

@@ -1,5 +1,4 @@
-FILE(GLOB_RECURSE UTIL_SOURCES *.cpp)
-FILE(GLOB_RECURSE UTIL_HEADERS *.h)
+FILE(GLOB_RECURSE ANKI_UTIL_SOURCES *.cpp)
+FILE(GLOB_RECURSE ANKI_UTIL_HEADERS *.h)
 
-INCLUDE_DIRECTORIES(.)
-ADD_LIBRARY(util ${UTIL_SOURCES} ${UTIL_HEADERS})
+ADD_LIBRARY(ankiutil ${ANKI_UTIL_SOURCES} ${ANKI_UTIL_HEADERS})