Commit db25c8b3 authored by Nicolas Docquier's avatar Nicolas Docquier
Browse files

Merge branch 'utilities_dynamic_lib' into 'master'

Utilities dynamic lib

See merge request !19
parents e020f452 8b385004
......@@ -149,6 +149,7 @@ if (FLAG_SEPARATE_BUILD)
find_package(LibRobotranC REQUIRED)
target_link_libraries(${Executable} "${LIB_MBSYSC_MODULES}")
target_link_libraries(${Executable} "${LIB_MBSYSC_LOAD}")
target_link_libraries(${Executable} "${LIB_MBSYSC_UTILITIES}")
else (FLAG_SEPARATE_BUILD)
add_subdirectory("${ROBOTRAN_SOURCE_DIR}/mbs_common" "${CMAKE_CURRENT_BINARY_DIR}/mbs_common")
......
......@@ -38,9 +38,15 @@ SET(TRIAL_PATHS_LIB_MBSYSC_LOAD
"${ROBOTRAN_SOURCE_DIR}/build/mbs_load_xml"
)
# possible paths for: 'libMBsysC_numerics.so'
SET(TRIAL_PATHS_LIB_MBSYSC_UTILITIES
"${ROBOTRAN_SOURCE_DIR}/build/mbs_utilities"
)
FIND_LIBRARY(LIB_MBSYSC_MODULES libMBsysC_module.so ${TRIAL_PATHS_LIB_MBSYSC_MODULES})
FIND_LIBRARY(LIB_MBSYSC_LOAD libMBsysC_loadXML.so ${TRIAL_PATHS_LIB_MBSYSC_LOAD})
FIND_LIBRARY(LIB_MBSYSC_UTILITIES libMBsysC_utilities.so ${TRIAL_PATHS_LIB_MBSYSC_UTILITIES})
#SET(SDL2_LIBRARIES ${SDL2_LIBRARIES_SDL2})
......@@ -60,11 +66,11 @@ ENDIF (UNIX)
# flag put to 1 if all required files are found
IF(LIB_MBSYSC_MODULES AND LIB_MBSYSC_LOAD)
IF(LIB_MBSYSC_MODULES AND LIB_MBSYSC_LOAD AND LIB_MBSYSC_UTILITIES)
SET(ROBOTRAN_C_FOUND 1)
ELSE(LIB_MBSYSC_MODULES AND LIB_MBSYSC_LOAD)
ELSE(LIB_MBSYSC_MODULES AND LIB_MBSYSC_LOAD AND LIB_MBSYSC_UTILITIES)
SET(ROBOTRAN_C_FOUND 0)
ENDIF(LIB_MBSYSC_MODULES AND LIB_MBSYSC_LOAD)
ENDIF(LIB_MBSYSC_MODULES AND LIB_MBSYSC_LOAD AND LIB_MBSYSC_UTILITIES)
# outputs
MARK_AS_ADVANCED(
......
......@@ -15,7 +15,13 @@ init_include()
set(INCLUDE_DIR ${INCLUDE_DIR} "./" PARENT_SCOPE)
set(INCLUDE_DIR ${INCLUDE_DIR} "./auto_output" PARENT_SCOPE)
add_library(MBsysC_utilities ${SOURCE_FILES} ${INCLUDE_DIR})
if(FLAG_SHARED_LIB)
add_library(MBsysC_utilities SHARED ${SOURCE_FILES} ${INCLUDE_DIR})
target_link_libraries(MBsysC_struct)
else(FLAG_SHARED_LIB)
add_library(MBsysC_utilities STATIC ${SOURCE_FILES} ${INCLUDE_DIR})
endif(FLAG_SHARED_LIB)
include_directories("./")
include_directories("./auto_output")
......
Supports Markdown
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