Commit f9dd5821 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'Package_libs_fix' into 'master'

Package libs fix

Find Physim and Comiso in Packages

See merge request !13
parents dfcd8304 a4bff888
......@@ -137,6 +137,7 @@ file (
RELATIVE "${CMAKE_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/libs_required/*/CMakeLists.txt"
"${CMAKE_SOURCE_DIR}/libs/*/CMakeLists.txt"
"${CMAKE_SOURCE_DIR}/Package-*/libs/*/CMakeLists.txt"
)
set( REMAINING_LOCAL_LIBS "" )
......
......@@ -12,11 +12,19 @@ IF (COMISO_INCLUDE_DIR)
SET(COMISO_FIND_QUIETLY TRUE)
ENDIF (COMISO_INCLUDE_DIR)
# search all lib directories in packages for OpenFlipper
file (
GLOB _libdirs
"${CMAKE_SOURCE_DIR}/libs"
"${CMAKE_SOURCE_DIR}/Package-*/libs"
)
# Find CoMISo config file
FIND_PATH( COMISO_INCLUDE_DIR CoMISo/Config/config.hh
PATHS "${CMAKE_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/libs/"
"${_libdirs}"
"${CMAKE_SOURCE_DIR}/../" )
if ( COMISO_INCLUDE_DIR )
......
......@@ -11,8 +11,17 @@ IF (PHYSIM_INCLUDE_DIRS)
SET(PHYSIM_FIND_QUIETLY TRUE)
ENDIF (PHYSIM_INCLUDE_DIRS)
# search all lib directories in packages for OpenFlipper
file (
GLOB _libdirs
"${CMAKE_SOURCE_DIR}/libs"
"${CMAKE_SOURCE_DIR}/Package-*/libs"
)
FIND_PATH( PHYSIM_INCLUDE_DIRS PhySim/Config/PhySimDefines.hh
PATHS "${CMAKE_SOURCE_DIR}/libs" )
PATHS "${_libdirs}"
"${CMAKE_SOURCE_DIR}/libs" )
add_definitions (-DPHYSIMDLL -DUSEPHYSIM )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment