Skip to content

Commit

Permalink
- we are now using boost_LIBNAME_found instead of boost_LIBNAME_libra…
Browse files Browse the repository at this point in the history
…ry to check if the boost library was found on the system. This should fix the linux_nightly_build

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21615 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Marcus Walther committed Jul 25, 2014
1 parent ae4957c commit c07507f
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions SimulationRuntime/cpp/CMakeLists.txt
Expand Up @@ -122,25 +122,25 @@ SET(Boost_USE_STATIC_RUNTIME OFF)

# The optional boost libraries must be searched separately, otherwise no library is found if just one is missing.
# Additionaly the Boost_LIBRARIES variable is overwritten each time find_package(Boost ...) is called, thus it must be rescued
find_package(Boost 1.54 COMPONENTS log log_setup)
find_package(Boost COMPONENTS log log_setup)
SET(Boost_LIBRARIES_TMP ${Boost_LIBRARIES_TMP} ${Boost_LIBRARIES})
IF(Boost_LOG_LIBRARY AND Boost_LOG_SETUP_LIBRARY)
IF(Boost_LOG_FOUND AND Boost_LOG_SETUP_FOUND)
add_definitions(-DUSE_BOOST_LOG)
message(STATUS "Using boost log")
ELSE(Boost_LOG_LIBRARY AND Boost_LOG_SETUP_LIBRARY)
ELSE(Boost_LOG_FOUND AND Boost_LOG_SETUP_FOUND)
message(STATUS "Boost log disabled")
unset(Boost_LOG_LIBRARY)
ENDIF(Boost_LOG_LIBRARY AND Boost_LOG_SETUP_LIBRARY)
ENDIF(Boost_LOG_FOUND AND Boost_LOG_SETUP_FOUND)

find_package(Boost 1.54 COMPONENTS thread atomic)
find_package(Boost COMPONENTS thread atomic)
SET(Boost_LIBRARIES_TMP ${Boost_LIBRARIES_TMP} ${Boost_LIBRARIES})
find_package(Threads)
IF(Boost_THREAD_LIBRARY AND Boost_ATOMIC_LIBRARY)
IF(Boost_THREAD_FOUND AND Boost_ATOMIC_FOUND)
add_definitions(-DUSE_BOOST_THREAD)
message(STATUS "Using boost thread")
ELSE(Boost_THREAD_LIBRARY AND Boost_ATOMIC_LIBRARY)
ELSE(Boost_THREAD_FOUND AND Boost_ATOMIC_FOUND)
message(STATUS "Boost thread disabled")
ENDIF(Boost_THREAD_LIBRARY AND Boost_ATOMIC_LIBRARY)
ENDIF(Boost_THREAD_FOUND AND Boost_ATOMIC_FOUND)

find_package(Boost COMPONENTS filesystem system serialization program_options REQUIRED)
SET(Boost_LIBRARIES_TMP ${Boost_LIBRARIES_TMP} ${Boost_LIBRARIES})
Expand Down

0 comments on commit c07507f

Please sign in to comment.