Commit ce31be61 authored by Alexis SALZMAN's avatar Alexis SALZMAN

[xMapping] Change CMakeList file to cope with ARCHOS change

In xMapping attempt by N.C. to use modern cmake mechanism that
associate dependency to target work successfully in the reference
context (tnode 10).
In my context lack of dependency make compilation stop. From a brief
analysis I do related this problem to the fact that in my context I use
ARCHOS variable. When touching to ARCHOS variable target dependency
recognition seems to be in default. Hypothesis to confirm.

For now I switch back to old way of treating dependency.
parent 487ba92c
......@@ -14,7 +14,7 @@
message_verbose(text)
#find_package(xTool REQUIRED )
find_package(xTool REQUIRED )
find_package(xTensor REQUIRED )
......@@ -24,7 +24,7 @@
add_library(xMapping ${BUILD_SHARED_LIBS} ${src_files} )
set_target_properties(xMapping PROPERTIES CXX_EXTENSIONS OFF CXX_STANDARD 11)
target_include_directories(xMapping PUBLIC ${xTensor_INCLUDE_DIR})
target_include_directories(xMapping PUBLIC ${xTensor_INCLUDE_DIR} ${xTool_INCLUDE_DIR} )
#the commented lines below is a "modern" CMake version ... It does not work with the CMake Version on Titan (2.8.11)...
#target_link_libraries(xMapping PUBLIC ${xTensor_LIBRARIES})
#target_compile_options(xMapping PRIVATE -Wall -Wextra -pedantic )
......
......@@ -6,8 +6,17 @@ set(text "----------------------")
message_verbose(text)
find_and_set(xMapping xMapping EXTERNAL_INCLUDES EXTERNAL_LIBRARIES REQUIRED )
find_and_set(xTensor xTensor EXTERNAL_INCLUDES EXTERNAL_LIBRARIES REQUIRED )
find_and_set(xTool xTool EXTERNAL_INCLUDES EXTERNAL_LIBRARIES REQUIRED )
#find_and_set(Boost Boost EXTERNAL_INCLUDES NOTHING REQUIRED )
list(APPEND EXTERNAL_INCLUDES
${MPI_CXX_INCLUDE_PATH}
)
list(APPEND EXTERNAL_LIBRARIES
${MPI_CXX_LIBRARIES}
)
set(LIST
${CMAKE_CURRENT_SOURCE_DIR}/testxLagrangeMapping
......
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