Skip to content

Commit

Permalink
moved transitive find of c-blosc to FindAGS_EXAMPLE_CPP_LIB.cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
sstirlin committed Jan 21, 2015
1 parent 55746c6 commit fa357be
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
8 changes: 0 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,6 @@ message (STATUS "CBLOSC SHARED LIB: ${AGS_EXAMPLE_CPP_LIB_LIBRARIES}")
set (DLLS_to_install ${DLLS_to_install} ${AGS_EXAMPLE_CPP_LIB_DLLS})


# find c-blosc (set hint CBLOSC_ROOT)
find_package(CBLOSC REQUIRED)
include_directories(${CBLOSC_INCLUDE_DIR})
message (STATUS "CBLOSC DLLS: ${CBLOSC_DLLS}")
message (STATUS "CBLOSC SHARED LIB: ${CBLOSC_LIBRARIES}")
set (DLLS_to_install ${DLLS_to_install} ${CBLOSC_DLLS})


# find Boost (set hint BOOST_ROOT)
set (Boost_USE_STATIC_LIBS OFF)
set (Boost_USE_STATIC_RUNTIME OFF) # this should always be set to OFF
Expand Down
15 changes: 15 additions & 0 deletions cmake/Modules/FindAGS_EXAMPLE_CPP_LIB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@ if (NOT AGS_EXAMPLE_CPP_LIB_ROOT)
set (AGS_EXAMPLE_CPP_LIB_ROOT $ENV{AGS_EXAMPLE_CPP_LIB_ROOT})
endif ()


# c-blosc is needed for transitive linking, so we locate that as well
if (NOT CBLOSC_ROOT)
set (CBLOSC_ROOT ${AGS_EXAMPLE_CPP_LIB_ROOT})
endif ()

# find c-blosc (set hint CBLOSC_ROOT)
find_package(CBLOSC REQUIRED)
message (STATUS "CBLOSC DLLS: ${CBLOSC_DLLS}")
message (STATUS "CBLOSC SHARED LIB: ${CBLOSC_LIBRARIES}")


# find include dir
find_path(AGS_EXAMPLE_CPP_LIB_INCLUDE_DIR
NAMES activision_game_science/blosc_wrapper.h
Expand Down Expand Up @@ -89,6 +101,9 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(AGS_EXAMPLE_CPP_LIB REQUIRED_VARS AGS_EXAMPLE_


if(AGS_EXAMPLE_CPP_LIB_FOUND)
# add c-blosc libs on for transitive linking
set(AGS_EXAMPLE_CPP_LIB_LIBRARY ${AGS_EXAMPLE_CPP_LIB_LIBRARY} ${CBLOSC_LIBRARY})
set(AGS_EXAMPLE_CPP_LIB_STATIC_LIBRARY ${AGS_EXAMPLE_CPP_LIB_STATIC_LIBRARY} ${CBLOSC_STATIC_LIBRARY})
set(AGS_EXAMPLE_CPP_LIB_INCLUDE_DIRS ${AGS_EXAMPLE_CPP_LIB_INCLUDE_DIR})
set(AGS_EXAMPLE_CPP_LIB_STATIC_LIBRARIES ${AGS_EXAMPLE_CPP_LIB_STATIC_LIBRARY})
set(AGS_EXAMPLE_CPP_LIB_LIBRARIES ${AGS_EXAMPLE_CPP_LIB_LIBRARY})
Expand Down

0 comments on commit fa357be

Please sign in to comment.