gwm17/catima
1
0
Fork 0
mirror of https://github.com/gwm17/catima.git synced 2024-11-26 12:08:52 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33 from hrosiak/cmake

Browse Source 
cmake
This commit is contained in:
Andrej Prochazka 2018-04-18 15:20:14 +02:00 committed by GitHub
parent cfb2c5f21c 0fe45db471
commit 6e85043ce8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -70,7 +70,15 @@ file(GLOB HEADERS *.h)
add_library(catima SHARED ${SOURCES}) add_library(catima SHARED ${SOURCES})
add_library(catima_static STATIC ${SOURCES}) add_library(catima_static STATIC ${SOURCES})
set_target_properties(catima_static PROPERTIES OUTPUT_NAME catima POSITION_INDEPENDENT_CODE ON) set_target_properties(catima PROPERTIES
POSITION_INDEPENDENT_CODE ON
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib
)
set_target_properties(catima_static
PROPERTIES OUTPUT_NAME catima
POSITION_INDEPENDENT_CODE ON
ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib
)
target_link_libraries(catima ${EXTRA_LIBS} ${GSL_LIBRARIES} ) target_link_libraries(catima ${EXTRA_LIBS} ${GSL_LIBRARIES} )
target_link_libraries(catima_static ${EXTRA_LIBS} ${GSL_LIBRARIES}) target_link_libraries(catima_static ${EXTRA_LIBS} ${GSL_LIBRARIES})

4
init.sh.in
View File

@ -1,3 +1,3 @@
export CATIMAPATH=${PROJECT_BINARY_DIR} export CATIMAPATH=${PROJECT_BINARY_DIR}
#export PATH=$PATH:$CATIMAPATH/bin export PATH=$PATH:$CATIMAPATH/bin
export ${RPATH_VARIABLE}=$LD_LIBRARY_PATH:$CATIMAPATH export ${RPATH_VARIABLE}=$LD_LIBRARY_PATH:$CATIMAPATH/lib

2
tests/CMakeLists.txt
View File

@ -1,3 +1,4 @@
enable_testing()
add_definitions(-Dlest_FEATURE_COLOURISE=1) add_definitions(-Dlest_FEATURE_COLOURISE=1)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tests) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tests)
@ -6,6 +7,7 @@ set(CATIMA_TESTS test_calculations test_generated test_storage test_structures t
foreach(entry ${CATIMA_TESTS}) foreach(entry ${CATIMA_TESTS})
add_executable(${entry} ${entry}.cpp) add_executable(${entry} ${entry}.cpp)
target_link_libraries(${entry} catima) target_link_libraries(${entry} catima)
add_test(${entry} ${PROJECT_BINARY_DIR}/tests/${entry})
endforeach(entry in ${CATIMA_TESTS}) endforeach(entry in ${CATIMA_TESTS})