Changeset 11097 for code/trunk/cmake

Timestamp:

Jan 25, 2016, 9:47:54 PM (8 years ago)

Author:

landauf

Message:

fixed build on tardis.

Location:

code/trunk/cmake

Files:

• LibraryConfig.cmake (modified) (1 diff)
• LibraryConfigTardis.cmake (modified) (1 diff)

code/trunk/cmake/LibraryConfig.cmake

@@ -162 +162 @@
                               1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1 1.49.0
                               1.53.0)
-IF(NOT TARDIS)
-  FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
-ENDIF()
+FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
 # No auto linking, so this option is useless anyway
 MARK_AS_ADVANCED(Boost_LIB_DIAGNOSTIC_DEFINITIONS)

code/trunk/cmake/LibraryConfigTardis.cmake

@@ -40 +40 @@
 #  SET(CMAKE_CXX_COMPILER "g++-4.1.1")
 
-  # Note: When setting ENV${} variables, make sure to use quotes when
-  #       having multiple directories.
-  #SET(BOOST_INCLUDEDIR "/usr/pack/boost-1.42.0-bs/include")
-  #SET(BOOST_LIBRARYDIR "/usr/pack/boost-1.42.0-bs/i686-debian-linux4.0/lib")
-  SET(Boost_VERSION 104200)
-  SET(Boost_INCLUDE_DIRS "/usr/pack/boost-1.42.0-bs/include" CACHE PATH "")
-  SET(Boost_SYSTEM_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_system.so" CACHE PATH "")
-  SET(Boost_SYSTEM_LIBRARY_DEBUG "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_system-d.so" CACHE PATH "")
-  SET(Boost_DATE_TIME_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_date_time.so" CACHE PATH "")
-  SET(Boost_DATE_TIME_LIBRARY_DEBUG "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_date_time-d.so" CACHE PATH "")
-  SET(Boost_FILESYSTEM_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_filesystem.so" CACHE PATH "")
-  SET(Boost_FILESYSTEM_LIBRARY_DEBUG "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_filesystem-d.so" CACHE PATH "")
-  SET(Boost_THREAD_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_thread-mt.so" CACHE PATH "")
-  SET(Boost_THREAD_LIBRARY_DEBUG "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_thread-mt-d.so" CACHE PATH "")
-
-  SET(Boost_SYSTEM_LIBRARY "debug;${Boost_SYSTEM_LIBRARY_DEBUG};optimized;${Boost_SYSTEM_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
-  SET(Boost_DATE_TIME_LIBRARY "debug;${Boost_DATE_TIME_LIBRARY_DEBUG};optimized;${Boost_DATE_TIME_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
-  SET(Boost_FILESYSTEM_LIBRARY "debug;${Boost_FILESYSTEM_LIBRARY_DEBUG};optimized;${Boost_FILESYSTEM_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
-  SET(Boost_THREAD_LIBRARY "debug;${Boost_THREAD_LIBRARY_DEBUG};optimized;${Boost_THREAD_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
-
-  MARK_AS_ADVANCED( Boost_INCLUDE_DIRS )
-  MARK_AS_ADVANCED( Boost_SYSTEM_LIBRARY Boost_SYSTEM_LIBRARY_RELEASE Boost_SYSTEM_LIBRARY_DEBUG )
-  MARK_AS_ADVANCED( Boost_DATE_TIME_LIBRARY Boost_DATE_TIME_LIBRARY_RELEASE Boost_DATE_TIME_LIBRARY_DEBUG )
-  MARK_AS_ADVANCED( Boost_FILESYSTEM_LIBRARY Boost_FILESYSTEM_LIBRARY_RELEASE Boost_FILESYSTEM_LIBRARY_DEBUG )
-  MARK_AS_ADVANCED( Boost_THREAD_LIBRARY Boost_THREAD_LIBRARY_RELEASE Boost_THREAD_LIBRARY_DEBUG )
-
-
   LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/cegui-0.6.2-sd")
   LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/cegui-0.6.2-sd/amd64-debian-linux5.0")