Fixed some cmake issues

firebreath · Feb 18, 2011 · 89ab83a · 89ab83a
1 parent ef223d2
commit 89ab83a
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 18 deletions.
diff --git a/libs/date_time/CMakeLists.txt b/libs/date_time/CMakeLists.txt
@@ -16,8 +16,6 @@
 cmake_minimum_required (VERSION 2.6)
 set (CMAKE_BACKWARDS_COMPATIBILITY 2.6)
 
-include(${CMAKE_DIR}/common.cmake)
-
 include_directories (
     ${Boost_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/src

diff --git a/libs/filesystem/CMakeLists.txt b/libs/filesystem/CMakeLists.txt
@@ -16,8 +16,6 @@
 cmake_minimum_required (VERSION 2.6)
 set (CMAKE_BACKWARDS_COMPATIBILITY 2.6)
 
-include(${CMAKE_DIR}/common.cmake)
-
 if (BOOST_FILESYSTEM_V3)
     include_directories (
         ${Boost_INCLUDE_DIRS}
@@ -42,6 +40,8 @@ set(SOURCES
 
 add_library (boost_filesystem STATIC ${SOURCES})
 
-add_boost_library(system)
-export_project_dependencies()
+if (FIREBREATH)
+    add_boost_library(system)
+    export_project_dependencies()
+endif()
 
diff --git a/libs/regex/CMakeLists.txt b/libs/regex/CMakeLists.txt
@@ -16,8 +16,6 @@
 cmake_minimum_required (VERSION 2.6)
 set (CMAKE_BACKWARDS_COMPATIBILITY 2.6)
 
-include(${CMAKE_DIR}/common.cmake)
-
 include_directories (
     ${Boost_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/src

diff --git a/libs/serialization/CMakeLists.txt b/libs/serialization/CMakeLists.txt
@@ -16,8 +16,6 @@
 cmake_minimum_required (VERSION 2.6)
 set (CMAKE_BACKWARDS_COMPATIBILITY 2.6)
 
-include(${CMAKE_DIR}/common.cmake)
-
 add_definitions(-DBOOST_THREAD_BUILD_LIB=1)
 
 include_directories (

diff --git a/libs/signals/CMakeLists.txt b/libs/signals/CMakeLists.txt
@@ -16,8 +16,6 @@
 cmake_minimum_required (VERSION 2.6)
 set (CMAKE_BACKWARDS_COMPATIBILITY 2.6)
 
-include(${CMAKE_DIR}/common.cmake)
-
 include_directories (
     ${Boost_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/src

diff --git a/libs/smart_ptr/CMakeLists.txt b/libs/smart_ptr/CMakeLists.txt
@@ -16,8 +16,6 @@
 cmake_minimum_required (VERSION 2.6)
 set (CMAKE_BACKWARDS_COMPATIBILITY 2.6)
 
-include(${CMAKE_DIR}/common.cmake)
-
 include_directories (
     ${Boost_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/src

diff --git a/libs/system/CMakeLists.txt b/libs/system/CMakeLists.txt
@@ -16,8 +16,6 @@
 cmake_minimum_required (VERSION 2.6)
 set (CMAKE_BACKWARDS_COMPATIBILITY 2.6)
 
-include(${CMAKE_DIR}/common.cmake)
-
 include_directories (
     ${Boost_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/src

diff --git a/libs/thread/CMakeLists.txt b/libs/thread/CMakeLists.txt
@@ -16,8 +16,6 @@
 cmake_minimum_required (VERSION 2.6)
 set (CMAKE_BACKWARDS_COMPATIBILITY 2.6)
 
-include(${CMAKE_DIR}/common.cmake)
-
 add_definitions(-DBOOST_THREAD_BUILD_LIB=1)
 
 if (WIN32)