Updated RPATH references in project

Author: StevenAWhite

projects/biogears-common/CMakeLists.txt

@@ -75,7 +75,7 @@ set_target_properties(libbiogears_common
   POSITION_INDEPENDENT_CODE TRUE
   VS_DEBUGGER_WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/runtime
   BUILD_RPATH   "${Biogears_BUILD_RPATH}"
-  INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\${ORIGIN}:\${ORIGIN}/../lib:\${ORIGIN}/lib">>
+  INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\$ORIGIN:\$ORIGIN/../lib:\$ORIGIN/lib">>
   )
 target_compile_definitions(libbiogears_common PUBLIC  ${Common_INTERFACE_CPPFLAGS} PRIVATE ${Common_CPPFLAGS} )
 if (Biogears_COMMON_BUILD_STATIC)

projects/biogears/libBiogears/CMakeLists.txt

@@ -52,7 +52,7 @@ if(Biogears_BUILD_STATIC)
     DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}"
     CXX_STANDARD 14
     BUILD_RPATH   "${Biogears_BUILD_RPATH}"
-    INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\${ORIGIN}:\${ORIGIN}/../lib:\${ORIGIN}/lib">>
+    INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\$ORIGIN:\$ORIGIN/../lib:\$ORIGIN/lib">>
     )
     add_dependencies(libbiogears hex_bindings)
   set_target_properties(libbiogears PROPERTIES SOVERSION "${Biogears_LIB_VERSION}")

projects/biogears/libCDM/CMakeLists.txt

@@ -32,7 +32,7 @@ set(LIBBIO_CDM_SOURCES ${CDM_PUBLIC_SRCS} ${CDM_GEN_SRCS})
     DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}"
     CXX_STANDARD 14
     BUILD_RPATH   "${Biogears_BUILD_RPATH}"
-    INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\${ORIGIN}:\${ORIGIN}/../lib:\${ORIGIN}/lib">>
+    INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\$ORIGIN:\$ORIGIN/../lib:\$ORIGIN/lib">>
     )
   set_target_properties(libbiogears_cdm PROPERTIES SOVERSION "${Biogears_LIB_VERSION}")
   add_dependencies(libbiogears_cdm xsd_bindings)

projects/biogears/libIO/CMakeLists.txt

@@ -188,7 +188,7 @@ option(Biogears_IO_INCLUDE_SCENARIOS "Add default scenarios which can be generat
 if (Biogears_IO_INCLUDE_SCENARIOS)
 message(STATUS "            : Scenarios")
 FILE(GLOB_RECURSE DATA_SUBSTANCE_FILES   RELATIVE "${PROJECT_SOURCE_DIR}/share/Scenarios" LIST_DIRECTORIES false CONFIGURE_DEPENDS "${PROJECT_SOURCE_DIR}/share/Scenarios/*.xml")
-configure_io_directory_file( ${NAME_ARG} OUTPUT "directories/Scenarios.cpp.in" TYPE "Scenarios/" FILE_LIST ${DATA_SUBSTANCE_FILES} RESOURCE_PATH ${PROJECT_SOURCE_DIR}/share/ HEADERS GEN_HDRS SOURCES GEN_SRCS )
+configure_io_directory_file( ${NAME_ARG} OUTPUT "directories/scenarios.cpp.in" TYPE "Scenarios/" FILE_LIST ${DATA_SUBSTANCE_FILES} RESOURCE_PATH ${PROJECT_SOURCE_DIR}/share/ HEADERS GEN_HDRS SOURCES GEN_SRCS )
 endif()
 
 configure_file( src/constants.h.in  ${BIOGEARS_BINARY_DIR}/generated/biogears/io/constants.h NEWLINE_STYLE LF)
@@ -223,7 +223,7 @@ if(NOT Biogears_BUILD_STATIC)
     DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}"
     CXX_STANDARD 14
     BUILD_RPATH   "${Biogears_BUILD_RPATH}"
-    INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\${ORIGIN}:\${ORIGIN}/../lib:\${ORIGIN}/lib">>
+    INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\$ORIGIN:\$ORIGIN/../lib:\$ORIGIN/lib">>
     )
   set_target_properties(libbiogears_io PROPERTIES SOVERSION "${Biogears_LIB_VERSION}")
   add_dependencies(libbiogears_io hex_bindings xsd_bindings)

projects/cli/CMakeLists.txt

@@ -47,7 +47,7 @@ set_target_properties(bg-cli
   VS_DEBUGGER_WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/runtime
   VS_DEBUGGER_ENVIRONMENT "${VS_DEBUGGER_ENVIRONMENT_LIST}"
   BUILD_RPATH   "${Biogears_BUILD_RPATH}"
-  INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\${ORIGIN}:\${ORIGIN}/../lib:\${ORIGIN}/lib">>
+  INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\$ORIGIN:\$ORIGIN/../lib:\$ORIGIN/lib">>
   )
 if(WIN32)
   target_sources(bg-cli  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bg-cli.rc)
@@ -83,7 +83,7 @@ set_target_properties(bg-scenario
   VS_DEBUGGER_WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/runtime
   VS_DEBUGGER_ENVIRONMENT "${VS_DEBUGGER_ENVIRONMENT_LIST}"
   BUILD_RPATH   "${Biogears_BUILD_RPATH}"
-  INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\${ORIGIN}:\${ORIGIN}/../lib:\${ORIGIN}/lib">>
+  INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:"\@loader_path:@loader_path/../lib:@loader_path /lib">> $<UNIX AND NOT APPLE:"\$ORIGIN:\$ORIGIN/../lib:\$ORIGIN/lib">>
   )
   if(WIN32)
     target_sources(bg-scenario  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bg-scenario.rc)
@@ -149,7 +149,7 @@ if(NOT (CMAKE_CROSSCOMPILING OR APPLE))
     include(BundleUtilities)
 
     function(EXELIST result curdir)
-    get_filename_component( absolute_path ${curdir} REAL_PATH BASE_DIR ${PROJECT_BINARY_DIR})
+    get_filename_component( absolute_path ${curdir} REALPATH BASE_DIR ${PROJECT_BINARY_DIR})
     file(GLOB children RELATIVE \${absolute_path} \${absolute_path}/*)
     set(dirlist \"\")
     foreach(child \${children})

projects/howto/CMakeLists.txt

@@ -154,7 +154,7 @@ if(NOT (CMAKE_CROSSCOMPILING OR APPLE))
     include(BundleUtilities)
 
     function(EXELIST result curdir)
-    get_filename_component( absolute_path ${curdir} REAL_PATH BASE_DIR ${PROJECT_BINARY_DIR})
+    get_filename_component( absolute_path ${curdir} REALPATH BASE_DIR ${PROJECT_BINARY_DIR})
     file(GLOB children RELATIVE \"\${absolute_path}/\" \"\${absolute_path}/*\")
     set(dirlist \"\")
     foreach(child \${children})