From 362f7743fc754145e622fc3bdd3b94592c0e08f1 Mon Sep 17 00:00:00 2001 From: navarro Date: Wed, 25 Apr 2012 11:18:07 +0200 Subject: [PATCH] Fix compilation problem with library path. Cosmetics --- CMakeLists.txt | 2 +- FindSimGrid.cmake | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32bfee1375..6b731a45d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,7 +202,7 @@ if(WIN32) endif(PEXPORTS_PATH) else(WIN32) target_link_libraries(SG_java pcre pthread simgrid) - set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib") + set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib") endif(WIN32) # java_classes diff --git a/FindSimGrid.cmake b/FindSimGrid.cmake index b874fefd4b..168c9c9a7d 100644 --- a/FindSimGrid.cmake +++ b/FindSimGrid.cmake @@ -16,22 +16,23 @@ find_path(SIMGRID_INCLUDES msg/msg.h message(STATUS "Looking for lib SimGrid") if(SIMGRID_LIB) - message(STATUS "Looking for lib SimGrid - found") - if(CMAKE_CACHE_MAJOR_VERSION EQUAL "2" AND CMAKE_CACHE_MINOR_VERSION GREATER "7") #need cmake version 2.8 - get_filename_component(simgrid_version ${SIMGRID_LIB} REALPATH) - string(REPLACE "${SIMGRID_LIB}." "" simgrid_version "${simgrid_version}") - string(REGEX MATCH "^[0-9]" SIMGRID_MAJOR_VERSION "${simgrid_version}") - string(REGEX MATCH "^[0-9].[0-9]" SIMGRID_MINOR_VERSION "${simgrid_version}") - string(REGEX MATCH "^[0-9].[0-9].[0-9]" SIMGRID_PATCH_VERSION "${simgrid_version}") - string(REGEX REPLACE "^${SIMGRID_MINOR_VERSION}." "" SIMGRID_PATCH_VERSION "${SIMGRID_PATCH_VERSION}") - string(REGEX REPLACE "^${SIMGRID_MAJOR_VERSION}." "" SIMGRID_MINOR_VERSION "${SIMGRID_MINOR_VERSION}") - message(STATUS "Simgrid version : ${SIMGRID_MAJOR_VERSION}.${SIMGRID_MINOR_VERSION}") - endif(CMAKE_CACHE_MAJOR_VERSION EQUAL "2" AND CMAKE_CACHE_MINOR_VERSION GREATER "7") + message(STATUS "Looking for lib SimGrid - found") + get_filename_component(simgrid_version ${SIMGRID_LIB} REALPATH) + string(REPLACE "${SIMGRID_LIB}." "" simgrid_version "${simgrid_version}") + string(REGEX MATCH "^[0-9]" SIMGRID_MAJOR_VERSION "${simgrid_version}") + string(REGEX MATCH "^[0-9].[0-9]" SIMGRID_MINOR_VERSION "${simgrid_version}") + string(REGEX MATCH "^[0-9].[0-9].[0-9]" SIMGRID_PATCH_VERSION "${simgrid_version}") + string(REGEX REPLACE "^${SIMGRID_MINOR_VERSION}." "" SIMGRID_PATCH_VERSION "${SIMGRID_PATCH_VERSION}") + string(REGEX REPLACE "^${SIMGRID_MAJOR_VERSION}." "" SIMGRID_MINOR_VERSION "${SIMGRID_MINOR_VERSION}") else(SIMGRID_LIB) message(STATUS "Looking for lib SimGrid - not found") endif(SIMGRID_LIB) -message(STATUS "Simgrid: ${SIMGRID_LIB}") +string(REGEX REPLACE "libsimgrid.*" "" SIMGRID_LIB_PATH "${SIMGRID_LIB}") + +message(STATUS "Simgrid : ${SIMGRID_LIB}") +message(STATUS "Simgrid_path : ${SIMGRID_LIB_PATH}") +message(STATUS "Simgrid version : ${SIMGRID_MAJOR_VERSION}.${SIMGRID_MINOR_VERSION}") message(STATUS "Looking for msg.h") if(SIMGRID_INCLUDES) -- 2.20.1