[asl] 20/177: Cmake improvements
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Aug 27 09:22:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository asl.
commit e67ba98c6c4859147d5aee0c541f4b6f72e493e9
Author: AvtechScientific <AvtechScientific at users.noreply.github.com>
Date: Thu Jun 11 23:31:45 2015 +0300
Cmake improvements
---
CMakeLists.txt | 6 +++---
DefineFunctions.cmake | 9 ++++-----
src/CMakeLists.txt | 2 +-
test/testABD/CMakeLists.txt | 2 +-
test/testACL/CMakeLists.txt | 2 +-
test/testMath/CMakeLists.txt | 2 +-
test/testPhysics/elastic/CMakeLists.txt | 10 +++++-----
test/testPhysics/flow/CMakeLists.txt | 26 +++++++++++++-------------
test/testPhysics/heatTransfer/CMakeLists.txt | 2 +-
test/testPhysics/jumpingObjects/CMakeLists.txt | 3 +--
test/testPhysics/levelSet/CMakeLists.txt | 6 +++---
test/testPhysics/massTransferSM/CMakeLists.txt | 9 ++++-----
12 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5cb119..4331acc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,9 +7,11 @@ cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
# Set version number
set(ASL_VERSION_MAJOR 0)
set(ASL_VERSION_MINOR 1)
-set(ASL_VERSION_PATCH 1)
+set(ASL_VERSION_PATCH 3)
set(ASL_VERSION ${ASL_VERSION_MAJOR}.${ASL_VERSION_MINOR}.${ASL_VERSION_PATCH})
+set(CMAKE_CXX_STANDARD 11)
+
# Add definitions
include(DefineOptions.cmake)
include(DefineFunctions.cmake)
@@ -32,8 +34,6 @@ include(${VTK_USE_FILE})
include_directories(SYSTEM ${OpenCL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-set(CMAKE_CXX_FLAGS "-Wall -O3 -std=c++11")
-
add_subdirectory(src)
add_subdirectory(test)
diff --git a/DefineFunctions.cmake b/DefineFunctions.cmake
index 583a276..60d3e26 100644
--- a/DefineFunctions.cmake
+++ b/DefineFunctions.cmake
@@ -5,8 +5,8 @@ function(INSTALL_SUBLIB _SUBLIB _SUBLIB_PUBLIC_HEADERS)
install(TARGETS
${_SUBLIB}
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
)
# Install public headers preserving the source tree structure
@@ -14,13 +14,12 @@ function(INSTALL_SUBLIB _SUBLIB _SUBLIB_PUBLIC_HEADERS)
# Determine relative path from ${CMAKE_SOURCE_DIR}/src to ${header}
file(RELATIVE_PATH relative_path ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/${header})
# Extract directories of the relative path
- # ToDo: replace PATH with DIRECTORY for cmake > 2.8.11
- get_filename_component(directories ${relative_path} PATH)
+ get_filename_component(directories ${relative_path} DIRECTORY)
# ToDo: add COMPONENT libraries
install(FILES
${header}
DESTINATION
- include/${LIBRARY_NAME}/${directories}
+ include/${PROJECT_NAME}/${directories}
)
endforeach()
endfunction(INSTALL_SUBLIB)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 36b0801..87b0d71 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -89,7 +89,7 @@ INSTALL_SUBLIB(aslvtk aslvtk_PUBLIC_HEADERS)
if (WITH_MATIO)
find_package(MATIO 1.5.2 REQUIRED)
include_directories(SYSTEM ${MATIO_INCLUDE_DIRS} ${OpenCL_LIBRARIES})
- set(CMAKE_CXX_FLAGS "-fpermissive -Wall -O3 -std=c++11")
+ set(CMAKE_CXX_FLAGS "-fpermissive ${CMAKE_CXX_FLAGS}")
set(aslmatio_PUBLIC_HEADERS
utilities/aslMATLABCasters.h
diff --git a/test/testABD/CMakeLists.txt b/test/testABD/CMakeLists.txt
index 9ddb83a..a76f717 100644
--- a/test/testABD/CMakeLists.txt
+++ b/test/testABD/CMakeLists.txt
@@ -2,5 +2,5 @@
include_directories(${CMAKE_SOURCE_DIR}/src)
add_executable(testABDFormat testABDFormat.cc)
-target_link_libraries(testABDFormat asl asldata aslmath)
+target_link_libraries(testABDFormat asldata aslmath asl)
diff --git a/test/testACL/CMakeLists.txt b/test/testACL/CMakeLists.txt
index f9fc4a1..56bc20b 100644
--- a/test/testACL/CMakeLists.txt
+++ b/test/testACL/CMakeLists.txt
@@ -4,7 +4,7 @@ add_executable(testVectorOfElements testVectorOfElements.cc)
target_link_libraries(testVectorOfElements aslacl)
add_executable(testMatrixOfElements testMatrixOfElements.cc)
-target_link_libraries(testMatrixOfElements aslacl aslmath asl asldata)
+target_link_libraries(testMatrixOfElements aslacl aslmath asldata asl)
add_executable(testPerformance testPerformance.cc)
target_link_libraries(testPerformance aslacl)
diff --git a/test/testMath/CMakeLists.txt b/test/testMath/CMakeLists.txt
index 8fe036b..2879527 100644
--- a/test/testMath/CMakeLists.txt
+++ b/test/testMath/CMakeLists.txt
@@ -5,7 +5,7 @@ add_executable(testASLData testASLData.cc)
target_link_libraries(testASLData aslmath asl)
add_executable(testDistanceFunction testDistanceFunction.cc)
-target_link_libraries(testDistanceFunction aslmath asl aslvtk aslnum)
+target_link_libraries(testDistanceFunction aslmath aslvtk aslnum asl)
add_executable(testReductionFunction testReductionFunction.cc)
target_link_libraries(testReductionFunction asl)
diff --git a/test/testPhysics/elastic/CMakeLists.txt b/test/testPhysics/elastic/CMakeLists.txt
index 4cd0b5a..3c81d9c 100644
--- a/test/testPhysics/elastic/CMakeLists.txt
+++ b/test/testPhysics/elastic/CMakeLists.txt
@@ -2,22 +2,22 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
add_executable(poroelastic poroelastic.cc)
-target_link_libraries(poroelastic asl aslnum aslvtk)
+target_link_libraries(poroelastic aslnum aslvtk asl)
set_property(TARGET poroelastic PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/poroelastic)
add_executable(cubeIncompressibleGravity cubeIncompressibleGravity.cc)
-target_link_libraries(cubeIncompressibleGravity asl aslnum aslvtk)
+target_link_libraries(cubeIncompressibleGravity aslnum aslvtk asl)
set_property(TARGET cubeIncompressibleGravity PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cubeIncompressibleGravity)
add_executable(cubePoroelasticGravity cubePoroelasticGravity.cc)
-target_link_libraries(cubePoroelasticGravity asl aslnum aslvtk)
+target_link_libraries(cubePoroelasticGravity aslnum aslvtk asl)
set_property(TARGET cubePoroelasticGravity PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cubePoroelasticGravity)
add_executable(cubeGravity cubeGravity.cc)
-target_link_libraries(cubeGravity asl aslnum aslvtk)
+target_link_libraries(cubeGravity aslnum aslvtk asl)
set_property(TARGET cubeGravity PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cubeGravity)
add_executable(acousticWaves acousticWaves.cc)
-target_link_libraries(acousticWaves asl aslnum aslvtk)
+target_link_libraries(acousticWaves aslnum aslvtk asl)
set_property(TARGET acousticWaves PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/acousticWaves)
diff --git a/test/testPhysics/flow/CMakeLists.txt b/test/testPhysics/flow/CMakeLists.txt
index 26eaef9..90763d9 100644
--- a/test/testPhysics/flow/CMakeLists.txt
+++ b/test/testPhysics/flow/CMakeLists.txt
@@ -2,53 +2,53 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
add_executable(flow flow.cc)
-target_link_libraries(flow asl aslnum aslvtk)
+target_link_libraries(flow aslnum aslvtk asl)
set_property(TARGET flow PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/flow)
add_executable(flow2 flow2.cc)
-target_link_libraries(flow2 asl aslnum aslvtk)
+target_link_libraries(flow2aslnum aslvtk asl)
set_property(TARGET flow2 PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/flow2)
add_executable(flow3 flow3.cc)
-target_link_libraries(flow3 asl aslnum aslvtk)
+target_link_libraries(flow3 aslnum aslvtk asl)
set_property(TARGET flow3 PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/flow3)
add_executable(flowRotatingCylinders flowRotatingCylinders.cc)
-target_link_libraries(flowRotatingCylinders asl aslnum aslvtk)
+target_link_libraries(flowRotatingCylinders aslnum aslvtk asl)
set_property(TARGET flowRotatingCylinders PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/flowRotatingCylinders)
add_executable(flowKDPGrowth flowKDPGrowth.cc)
-target_link_libraries(flowKDPGrowth asl aslnum aslvtk)
+target_link_libraries(flowKDPGrowth aslnum aslvtk asl)
set_property(TARGET flowKDPGrowth PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/flowKDPGrowth)
add_executable(flowAroundObject flowAroundObject.cc)
-target_link_libraries(flowAroundObject asl aslnum aslvtk)
+target_link_libraries(flowAroundObject aslnum aslvtk asl)
set_property(TARGET flowAroundObject PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/flowAroundObject)
add_executable(compressor compressor.cc)
-target_link_libraries(compressor asl aslnum aslvtk)
+target_link_libraries(compressor aslnum aslvtk asl)
set_property(TARGET compressor PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/compressor)
add_executable(locomotive_in_tunnel locomotive_in_tunnel.cc)
-target_link_libraries(locomotive_in_tunnel asl aslnum aslvtk)
+target_link_libraries(locomotive_in_tunnel aslnum aslvtk asl)
set_property(TARGET locomotive_in_tunnel PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locomotive_in_tunnel)
add_executable(locomotive_stability locomotive_stability.cc)
-target_link_libraries(locomotive_stability asl aslnum aslvtk)
+target_link_libraries(locomotive_stability aslnum aslvtk asl)
set_property(TARGET locomotive_stability PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locomotive_stability)
add_executable(bus_wind bus_wind.cc)
-target_link_libraries(bus_wind asl aslnum aslvtk)
+target_link_libraries(bus_wind aslnum aslvtk asl)
set_property(TARGET bus_wind PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bus_wind)
add_executable(multiphase_flow multiphase_flow.cc)
-target_link_libraries(multiphase_flow asl aslnum aslvtk)
+target_link_libraries(multiphase_flow aslnum aslvtk asl)
set_property(TARGET multiphase_flow PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/multiphase_flow)
add_executable(multicomponent_flow multicomponent_flow.cc)
-target_link_libraries(multicomponent_flow asl aslnum aslvtk)
+target_link_libraries(multicomponent_flow aslnum aslvtk asl)
set_property(TARGET multicomponent_flow PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/multicomponent_flow)
add_executable(pitot_tube_ice pitot_tube_ice.cc)
-target_link_libraries(pitot_tube_ice asl aslnum aslvtk)
+target_link_libraries(pitot_tube_ice aslnum aslvtk asl)
set_property(TARGET pitot_tube_ice PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pitot_tube_ice)
diff --git a/test/testPhysics/heatTransfer/CMakeLists.txt b/test/testPhysics/heatTransfer/CMakeLists.txt
index 6f0e878..428d0f2 100644
--- a/test/testPhysics/heatTransfer/CMakeLists.txt
+++ b/test/testPhysics/heatTransfer/CMakeLists.txt
@@ -2,6 +2,6 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
add_executable(surfaceFlux surfaceFlux.cc)
-target_link_libraries(surfaceFlux asl aslnum aslvtk)
+target_link_libraries(surfaceFlux aslnum aslvtk asl)
set_property(TARGET surfaceFlux PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/surfaceFlux)
diff --git a/test/testPhysics/jumpingObjects/CMakeLists.txt b/test/testPhysics/jumpingObjects/CMakeLists.txt
index cc8bd89..b3d5656 100644
--- a/test/testPhysics/jumpingObjects/CMakeLists.txt
+++ b/test/testPhysics/jumpingObjects/CMakeLists.txt
@@ -1,7 +1,6 @@
include_directories(${CMAKE_SOURCE_DIR}/src)
-
add_executable(jumpingBox jumpingBox.cc)
-target_link_libraries(jumpingBox asl aslnum aslvtk)
+target_link_libraries(jumpingBox aslnum aslvtk asl)
set_property(TARGET jumpingBox PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/jumpingBox)
diff --git a/test/testPhysics/levelSet/CMakeLists.txt b/test/testPhysics/levelSet/CMakeLists.txt
index 2b7a209..b449115 100644
--- a/test/testPhysics/levelSet/CMakeLists.txt
+++ b/test/testPhysics/levelSet/CMakeLists.txt
@@ -2,14 +2,14 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
add_executable(levelSetBasic levelSetBasic.cc)
-target_link_libraries(levelSetBasic asl aslnum aslvtk)
+target_link_libraries(levelSetBasic aslnum aslvtk asl)
set_property(TARGET levelSetBasic PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/levelSetBasic)
add_executable(levelSetNormalGrowth levelSetNormalGrowth.cc)
-target_link_libraries(levelSetNormalGrowth asl aslnum aslvtk)
+target_link_libraries(levelSetNormalGrowth aslnum aslvtk asl)
set_property(TARGET levelSetNormalGrowth PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/levelSetNormalGrowth)
add_executable(levelSetFacetedGrowth levelSetFacetedGrowth.cc)
-target_link_libraries(levelSetFacetedGrowth asl aslnum aslvtk)
+target_link_libraries(levelSetFacetedGrowth aslnum aslvtk asl)
set_property(TARGET levelSetFacetedGrowth PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/levelSetFacetedGrowth)
diff --git a/test/testPhysics/massTransferSM/CMakeLists.txt b/test/testPhysics/massTransferSM/CMakeLists.txt
index a8b0955..5e84170 100644
--- a/test/testPhysics/massTransferSM/CMakeLists.txt
+++ b/test/testPhysics/massTransferSM/CMakeLists.txt
@@ -1,19 +1,18 @@
include_directories(${CMAKE_SOURCE_DIR}/src)
-
add_executable(testSMDiff testSMDiff.cc)
-target_link_libraries(testSMDiff asl aslnum aslvtk)
+target_link_libraries(testSMDiff aslnum aslvtk asl)
set_property(TARGET testSMDiff PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testSMDiff)
add_executable(testSMDiff3C testSMDiff3C.cc)
-target_link_libraries(testSMDiff3C asl aslnum aslvtk)
+target_link_libraries(testSMDiff3C aslnum aslvtk asl)
set_property(TARGET testSMDiff3C PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testSMDiff3C)
add_executable(testSMPhi testSMPhi.cc)
-target_link_libraries(testSMPhi asl aslnum aslvtk)
+target_link_libraries(testSMPhi aslnum aslvtk asl)
set_property(TARGET testSMPhi PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testSMPhi)
add_executable(testSMPhiBV testSMPhiBV.cc)
-target_link_libraries(testSMPhiBV asl aslnum aslvtk)
+target_link_libraries(testSMPhiBV aslnum aslvtk asl)
set_property(TARGET testSMPhiBV PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testSMPhiBV)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git
More information about the debian-science-commits
mailing list