From: Axel R. <ro...@us...> - 2016-08-27 07:43:53
|
Update of /cvsroot/sdif/Easdif/easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19698/easdif Modified Files: CMakeLists.txt Log Message: Small Fix in cmake configuration After the last fix the file SET_INSTALL_NAME.cmake.in could no longer be found in cases where EASDIF is a subproject in a larger project. This is working again now. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/easdif/CMakeLists.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** CMakeLists.txt 2 Aug 2016 11:18:01 -0000 1.24 --- CMakeLists.txt 27 Aug 2016 07:43:50 -0000 1.25 *************** *** 67,71 **** ELSE(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) SET(INSTALLED_TARGET_NAME ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Easdif${DEBUGEXT}${CMAKE_SHARED_LIBRARY_SUFFIX}.${EASDIF_VERSION}) ! CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/SDIF/cmModules/SET_INSTALL_NAME.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake) SET_TARGET_PROPERTIES(Easdif${DEBUGEXT} PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake ) ENDIF(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) --- 67,71 ---- ELSE(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) SET(INSTALLED_TARGET_NAME ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Easdif${DEBUGEXT}${CMAKE_SHARED_LIBRARY_SUFFIX}.${EASDIF_VERSION}) ! CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/cmModules/SET_INSTALL_NAME.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake) SET_TARGET_PROPERTIES(Easdif${DEBUGEXT} PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake ) ENDIF(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) |