[mapguide-commits] r9736 - in trunk/MgDev: . Common/Foundation Common/Geometry Common/MapGuideCommon Common/MdfModel Common/MdfParser Common/PlatformBase Common/Renderers Common/Stylization Desktop/MgDesktop Server/src/Common/Base Server/src/Common/Cache Server/src/Common/Manager Server/src/Common/Thread Server/src/Gws/GwsCommon Server/src/Gws/GwsQueryEngine Server/src/Gws/GwsResource Server/src/Services/Drawing Server/src/Services/Feature Server/src/Services/Kml Server/src/Services/Mapping Server/src/Services/Profiling Server/src/Services/Rendering Server/src/Services/Resource Server/src/Services/ServerAdmin Server/src/Services/Site Server/src/Services/Tile Web/src/ApacheAgent Web/src/HttpHandler Web/src/JavaApi Web/src/JavaApiEx Web/src/PhpApi Web/src/WebApp Web/src/WebSupport
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Sep 19 08:40:28 PDT 2020
Author: jng
Date: 2020-09-19 08:40:27 -0700 (Sat, 19 Sep 2020)
New Revision: 9736
Modified:
trunk/MgDev/CMakeLists.txt
trunk/MgDev/Common/Foundation/CMakeLists.txt
trunk/MgDev/Common/Geometry/CMakeLists.txt
trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt
trunk/MgDev/Common/MdfModel/CMakeLists.txt
trunk/MgDev/Common/MdfParser/CMakeLists.txt
trunk/MgDev/Common/PlatformBase/CMakeLists.txt
trunk/MgDev/Common/Renderers/CMakeLists.txt
trunk/MgDev/Common/Stylization/CMakeLists.txt
trunk/MgDev/Desktop/MgDesktop/CMakeLists.txt
trunk/MgDev/Server/src/Common/Base/CMakeLists.txt
trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt
trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt
trunk/MgDev/Server/src/Common/Thread/CMakeLists.txt
trunk/MgDev/Server/src/Gws/GwsCommon/CMakeLists.txt
trunk/MgDev/Server/src/Gws/GwsQueryEngine/CMakeLists.txt
trunk/MgDev/Server/src/Gws/GwsResource/CMakeLists.txt
trunk/MgDev/Server/src/Services/Drawing/CMakeLists.txt
trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt
trunk/MgDev/Server/src/Services/Kml/CMakeLists.txt
trunk/MgDev/Server/src/Services/Mapping/CMakeLists.txt
trunk/MgDev/Server/src/Services/Profiling/CMakeLists.txt
trunk/MgDev/Server/src/Services/Rendering/CMakeLists.txt
trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt
trunk/MgDev/Server/src/Services/ServerAdmin/CMakeLists.txt
trunk/MgDev/Server/src/Services/Site/CMakeLists.txt
trunk/MgDev/Server/src/Services/Tile/CMakeLists.txt
trunk/MgDev/Web/src/ApacheAgent/CMakeLists.txt
trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt
trunk/MgDev/Web/src/JavaApi/CMakeLists.txt
trunk/MgDev/Web/src/JavaApiEx/CMakeLists.txt
trunk/MgDev/Web/src/PhpApi/CMakeLists.txt
trunk/MgDev/Web/src/WebApp/CMakeLists.txt
trunk/MgDev/Web/src/WebSupport/CMakeLists.txt
Log:
Update symlink installation to have symlinks be relative to its library. Fixes #2826
Modified: trunk/MgDev/CMakeLists.txt
===================================================================
--- trunk/MgDev/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -210,9 +210,8 @@
# Some helper macros
macro(install_symlink target linkname component)
- # The link target doesn't have to exist at this point in time, the symlink will be valid at install time
- execute_process(COMMAND ln -sf ${target} ${CMAKE_CURRENT_BINARY_DIR}/${linkname})
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${linkname} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${component})
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${target} ${MG_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${linkname})")
+ install(CODE "message(\"-- Created symlink: ${linkname} -> ${target}\")")
endmacro(install_symlink)
macro(use_cxx11)
if (CMAKE_VERSION VERSION_LESS "3.1")
Modified: trunk/MgDev/Common/Foundation/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/Foundation/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Common/Foundation/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -25,7 +25,7 @@
set_target_properties(MgFoundation${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
install( TARGETS MgFoundation${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
-install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgFoundation${MG_VERSION_SUFFIX}.so libMgFoundation.so ${MG_COMPONENT} )
+install_symlink(libMgFoundation${MG_VERSION_SUFFIX}.so libMgFoundation.so ${MG_COMPONENT} )
if (INTERNAL_ACE)
install(FILES ${MG_OEM_WORK_DIR}/ACE/ACE_wrappers/ace/libACE.so DESTINATION ${LIB_INSTALL_DIR})
Modified: trunk/MgDev/Common/Geometry/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/Geometry/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Common/Geometry/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -76,4 +76,4 @@
set_target_properties(MgGeometry${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
install( TARGETS MgGeometry${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
-install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGeometry${MG_VERSION_SUFFIX}.so libMgGeometry.so ${MG_COMPONENT} )
\ No newline at end of file
+install_symlink(libMgGeometry${MG_VERSION_SUFFIX}.so libMgGeometry.so ${MG_COMPONENT} )
\ No newline at end of file
Modified: trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -30,7 +30,7 @@
set_target_properties(MgMapGuideCommon${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
install(TARGETS MgMapGuideCommon${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMapGuideCommon${MG_VERSION_SUFFIX}.so libMgMapGuideCommon.so ${MG_COMPONENT})
+install_symlink(libMgMapGuideCommon${MG_VERSION_SUFFIX}.so libMgMapGuideCommon.so ${MG_COMPONENT})
if (NOT MG_COMMON_SUBSET_ONLY)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources DESTINATION ${MG_WWWROOT} COMPONENT ${MG_COMPONENT})
Modified: trunk/MgDev/Common/MdfModel/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/MdfModel/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Common/MdfModel/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -122,4 +122,4 @@
set_target_properties(MgMdfModel${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
install( TARGETS MgMdfModel${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
-install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMdfModel${MG_VERSION_SUFFIX}.so libMgMdfModel.so ${MG_COMPONENT} )
\ No newline at end of file
+install_symlink(libMgMdfModel${MG_VERSION_SUFFIX}.so libMgMdfModel.so ${MG_COMPONENT} )
\ No newline at end of file
Modified: trunk/MgDev/Common/MdfParser/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/MdfParser/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Common/MdfParser/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -130,4 +130,4 @@
set_target_properties(MgMdfParser${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
install( TARGETS MgMdfParser${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
-install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMdfParser${MG_VERSION_SUFFIX}.so libMgMdfParser.so ${MG_COMPONENT} )
\ No newline at end of file
+install_symlink(libMgMdfParser${MG_VERSION_SUFFIX}.so libMgMdfParser.so ${MG_COMPONENT} )
\ No newline at end of file
Modified: trunk/MgDev/Common/PlatformBase/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/PlatformBase/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Common/PlatformBase/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -29,4 +29,4 @@
set_target_properties(MgPlatformBase${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
install( TARGETS MgPlatformBase${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
-install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgPlatformBase${MG_VERSION_SUFFIX}.so libMgPlatformBase.so ${MG_COMPONENT} )
\ No newline at end of file
+install_symlink(libMgPlatformBase${MG_VERSION_SUFFIX}.so libMgPlatformBase.so ${MG_COMPONENT} )
\ No newline at end of file
Modified: trunk/MgDev/Common/Renderers/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/Renderers/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Common/Renderers/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -67,4 +67,4 @@
)
install( TARGETS MgRenderers${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
-install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgRenderers${MG_VERSION_SUFFIX}.so libMgRenderers.so ${MG_COMPONENT} )
\ No newline at end of file
+install_symlink(libMgRenderers${MG_VERSION_SUFFIX}.so libMgRenderers.so ${MG_COMPONENT} )
\ No newline at end of file
Modified: trunk/MgDev/Common/Stylization/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/Stylization/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Common/Stylization/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -108,4 +108,4 @@
)
install( TARGETS MgStylization${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
-install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgStylization${MG_VERSION_SUFFIX}.so libMgStylization.so ${MG_COMPONENT} )
\ No newline at end of file
+install_symlink(libMgStylization${MG_VERSION_SUFFIX}.so libMgStylization.so ${MG_COMPONENT} )
\ No newline at end of file
Modified: trunk/MgDev/Desktop/MgDesktop/CMakeLists.txt
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Desktop/MgDesktop/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -31,7 +31,7 @@
add_library(MgDesktop${MG_VERSION_SUFFIX} SHARED ${MgDesktop_SRCS})
install(TARGETS MgDesktop${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgDesktop${MG_VERSION_SUFFIX}.so libMgDesktop.so ${MG_COMPONENT})
+install_symlink(libMgDesktop${MG_VERSION_SUFFIX}.so libMgDesktop.so ${MG_COMPONENT})
target_link_libraries(MgDesktop${MG_VERSION_SUFFIX}
${ACE_LIBRARY}
Modified: trunk/MgDev/Server/src/Common/Base/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Common/Base/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Common/Base/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -15,7 +15,7 @@
add_library(MgServerBase${MG_VERSION_SUFFIX} SHARED ${MgServerBase_SRCS})
install(TARGETS MgServerBase${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerBase${MG_VERSION_SUFFIX}.so libMgServerBase.so ${MG_COMPONENT})
+install_symlink(libMgServerBase${MG_VERSION_SUFFIX}.so libMgServerBase.so ${MG_COMPONENT})
target_link_libraries(MgServerBase${MG_VERSION_SUFFIX}
MgMapGuideCommon${MG_VERSION_SUFFIX}
Modified: trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -12,7 +12,7 @@
add_library(MgServerCache${MG_VERSION_SUFFIX} SHARED ${MgServerCache_SRCS})
install(TARGETS MgServerCache${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerCache${MG_VERSION_SUFFIX}.so libMgServerCache.so ${MG_COMPONENT})
+install_symlink(libMgServerCache${MG_VERSION_SUFFIX}.so libMgServerCache.so ${MG_COMPONENT})
target_link_libraries(MgServerCache${MG_VERSION_SUFFIX}
MgFoundation${MG_VERSION_SUFFIX}
Modified: trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -30,7 +30,7 @@
add_library(MgServerManager${MG_VERSION_SUFFIX} SHARED ${MgServerManager_SRCS})
install(TARGETS MgServerManager${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerManager${MG_VERSION_SUFFIX}.so libMgServerManager.so ${MG_COMPONENT})
+install_symlink(libMgServerManager${MG_VERSION_SUFFIX}.so libMgServerManager.so ${MG_COMPONENT})
target_link_libraries(MgServerManager${MG_VERSION_SUFFIX}
${FDO_LIBRARY}
Modified: trunk/MgDev/Server/src/Common/Thread/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Common/Thread/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Common/Thread/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -13,7 +13,7 @@
add_library(MgServerThread${MG_VERSION_SUFFIX} SHARED ${MgServerThread_SRCS})
install(TARGETS MgServerThread${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerThread${MG_VERSION_SUFFIX}.so libMgServerThread.so ${MG_COMPONENT})
+install_symlink(libMgServerThread${MG_VERSION_SUFFIX}.so libMgServerThread.so ${MG_COMPONENT})
target_link_libraries(MgServerThread${MG_VERSION_SUFFIX}
${ACE_LIBRARY}
Modified: trunk/MgDev/Server/src/Gws/GwsCommon/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsCommon/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Gws/GwsCommon/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -25,4 +25,4 @@
add_library(MgGwsCommon${MG_VERSION_SUFFIX} SHARED ${GwsCommon_SRCS})
install(TARGETS MgGwsCommon${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGwsCommon${MG_VERSION_SUFFIX}.so libMgGwsCommon.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(libMgGwsCommon${MG_VERSION_SUFFIX}.so libMgGwsCommon.so ${MG_COMPONENT})
\ No newline at end of file
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -51,4 +51,4 @@
add_library(MgGwsQueryEngine${MG_VERSION_SUFFIX} SHARED ${GwsQueryEngine_SRCS})
install(TARGETS MgGwsQueryEngine${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGwsQueryEngine${MG_VERSION_SUFFIX}.so libMgGwsQueryEngine.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(libMgGwsQueryEngine${MG_VERSION_SUFFIX}.so libMgGwsQueryEngine.so ${MG_COMPONENT})
\ No newline at end of file
Modified: trunk/MgDev/Server/src/Gws/GwsResource/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsResource/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Gws/GwsResource/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -6,4 +6,4 @@
add_library(MgGwsResource${MG_VERSION_SUFFIX} SHARED ${GwsResource_SRCS})
install(TARGETS MgGwsResource${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGwsResource${MG_VERSION_SUFFIX}.so libMgGwsResource.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(libMgGwsResource${MG_VERSION_SUFFIX}.so libMgGwsResource.so ${MG_COMPONENT})
\ No newline at end of file
Modified: trunk/MgDev/Server/src/Services/Drawing/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Services/Drawing/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -21,4 +21,4 @@
add_library(MgServerDrawingService${MG_VERSION_SUFFIX} SHARED ${MgServerDrawingService_SRCS})
install(TARGETS MgServerDrawingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerDrawingService${MG_VERSION_SUFFIX}.so libMgServerDrawingService.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(libMgServerDrawingService${MG_VERSION_SUFFIX}.so libMgServerDrawingService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -26,7 +26,7 @@
add_library(MgServerFeatureService${MG_VERSION_SUFFIX} SHARED ${MgServerFeatureService_SRCS})
install(TARGETS MgServerFeatureService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerFeatureService${MG_VERSION_SUFFIX}.so libMgServerFeatureService.so ${MG_COMPONENT})
+install_symlink(libMgServerFeatureService${MG_VERSION_SUFFIX}.so libMgServerFeatureService.so ${MG_COMPONENT})
target_link_libraries(MgServerFeatureService${MG_VERSION_SUFFIX}
MgGwsCommon${MG_VERSION_SUFFIX}
Modified: trunk/MgDev/Server/src/Services/Kml/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/Kml/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Services/Kml/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -28,4 +28,4 @@
add_library(MgServerKmlService${MG_VERSION_SUFFIX} SHARED ${MgServerKmlService_SRCS})
install(TARGETS MgServerKmlService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerKmlService${MG_VERSION_SUFFIX}.so libMgServerKmlService.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(libMgServerKmlService${MG_VERSION_SUFFIX}.so libMgServerKmlService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: trunk/MgDev/Server/src/Services/Mapping/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Services/Mapping/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -27,4 +27,4 @@
add_library(MgServerMappingService${MG_VERSION_SUFFIX} SHARED ${MgServerMappingService_SRCS})
install(TARGETS MgServerMappingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerMappingService${MG_VERSION_SUFFIX}.so libMgServerMappingService.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(libMgServerMappingService${MG_VERSION_SUFFIX}.so libMgServerMappingService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: trunk/MgDev/Server/src/Services/Profiling/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/Profiling/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Services/Profiling/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -20,4 +20,4 @@
add_library(MgServerProfilingService${MG_VERSION_SUFFIX} SHARED ${MgServerProfilingService_SRCS})
install(TARGETS MgServerProfilingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerProfilingService${MG_VERSION_SUFFIX}.so libMgServerProfilingService.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(libMgServerProfilingService${MG_VERSION_SUFFIX}.so libMgServerProfilingService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: trunk/MgDev/Server/src/Services/Rendering/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Services/Rendering/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -23,4 +23,4 @@
add_library(MgServerRenderingService${MG_VERSION_SUFFIX} SHARED ${MgServerRenderingService_SRCS})
install(TARGETS MgServerRenderingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerRenderingService${MG_VERSION_SUFFIX}.so libMgServerRenderingService.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(libMgServerRenderingService${MG_VERSION_SUFFIX}.so libMgServerRenderingService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -41,7 +41,7 @@
minizip
)
install(TARGETS MgServerResourceService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerResourceService${MG_VERSION_SUFFIX}.so libMgServerResourceService.so ${MG_COMPONENT})
+install_symlink(libMgServerResourceService${MG_VERSION_SUFFIX}.so libMgServerResourceService.so ${MG_COMPONENT})
if(MG_CPU EQUAL 64)
set_target_properties(MgServerResourceService${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib64:$ORIGIN/../../lib64")
Modified: trunk/MgDev/Server/src/Services/ServerAdmin/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/ServerAdmin/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Services/ServerAdmin/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -15,4 +15,4 @@
add_library(MgServerAdminService${MG_VERSION_SUFFIX} SHARED ${MgServerAdminService_SRCS})
install(TARGETS MgServerAdminService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerAdminService${MG_VERSION_SUFFIX}.so libMgServerAdminService.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(libMgServerAdminService${MG_VERSION_SUFFIX}.so libMgServerAdminService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: trunk/MgDev/Server/src/Services/Site/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/Site/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Services/Site/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -18,4 +18,4 @@
add_library(MgServerSiteService${MG_VERSION_SUFFIX} SHARED ${MgServerSiteService_SRCS})
install(TARGETS MgServerSiteService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerSiteService${MG_VERSION_SUFFIX}.so libMgServerSiteService.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(libMgServerSiteService${MG_VERSION_SUFFIX}.so libMgServerSiteService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: trunk/MgDev/Server/src/Services/Tile/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/Tile/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Server/src/Services/Tile/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -17,4 +17,4 @@
add_library(MgServerTileService${MG_VERSION_SUFFIX} SHARED ${MgServerTileService_SRCS})
install(TARGETS MgServerTileService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerTileService${MG_VERSION_SUFFIX}.so libMgServerTileService.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(libMgServerTileService${MG_VERSION_SUFFIX}.so libMgServerTileService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: trunk/MgDev/Web/src/ApacheAgent/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Web/src/ApacheAgent/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -35,7 +35,11 @@
install(TARGETS mod_mgmapagent${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
# Not using install_symlink macro here as install requirements are unique
# The link target doesn't have to exist at this point in time, the symlink will be valid at install time
-execute_process(COMMAND ln -sf ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/mod_mgmapagent${MG_VERSION_SUFFIX}.so ${CMAKE_CURRENT_BINARY_DIR}/mod_mgmapagent.so)
+if(MG_CPU EQUAL 64)
+ execute_process(COMMAND ln -sf ../../lib64/mod_mgmapagent${MG_VERSION_SUFFIX}.so ${CMAKE_CURRENT_BINARY_DIR}/mod_mgmapagent.so)
+else(MG_CPU EQUAL 64)
+ execute_process(COMMAND ln -sf ../../lib/mod_mgmapagent${MG_VERSION_SUFFIX}.so ${CMAKE_CURRENT_BINARY_DIR}/mod_mgmapagent.so)
+endif(MG_CPU EQUAL 64)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mod_mgmapagent.so DESTINATION ${MG_INSTALL_WEB_PREFIX}/apache2/modules COMPONENT ${MG_COMPONENT})
target_link_libraries(mod_mgmapagent${MG_VERSION_SUFFIX}
Modified: trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -16,7 +16,7 @@
add_library(MgHttpHandler${MG_VERSION_SUFFIX} SHARED ${MgHttpHandler_SRCS})
install(TARGETS MgHttpHandler${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgHttpHandler${MG_VERSION_SUFFIX}.so libMgHttpHandler.so ${MG_COMPONENT})
+install_symlink(libMgHttpHandler${MG_VERSION_SUFFIX}.so libMgHttpHandler.so ${MG_COMPONENT})
target_link_libraries(MgHttpHandler${MG_VERSION_SUFFIX}
MgFoundation${MG_VERSION_SUFFIX}
Modified: trunk/MgDev/Web/src/JavaApi/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/JavaApi/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Web/src/JavaApi/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -61,7 +61,7 @@
add_library(MapGuideJavaApi${MG_VERSION_SUFFIX} SHARED ${MapGuideJavaApi_SRCS})
add_dependencies(MapGuideJavaApi${MG_VERSION_SUFFIX} swig IMake)
install(TARGETS MapGuideJavaApi${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMapGuideJavaApi${MG_VERSION_SUFFIX}.so libMapGuideJavaApi.so ${MG_COMPONENT})
+install_symlink(libMapGuideJavaApi${MG_VERSION_SUFFIX}.so libMapGuideJavaApi.so ${MG_COMPONENT})
set(MG_JARS
"${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApi.jar"
Modified: trunk/MgDev/Web/src/JavaApiEx/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Web/src/JavaApiEx/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -62,7 +62,7 @@
add_library(MapGuideJavaApiEx${MG_VERSION_SUFFIX} SHARED ${MapGuideJavaApiEx_SRCS})
add_dependencies(MapGuideJavaApiEx${MG_VERSION_SUFFIX} swig IMake)
install(TARGETS MapGuideJavaApiEx${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMapGuideJavaApiEx${MG_VERSION_SUFFIX}.so libMapGuideJavaApiEx.so ${MG_COMPONENT})
+install_symlink(libMapGuideJavaApiEx${MG_VERSION_SUFFIX}.so libMapGuideJavaApiEx.so ${MG_COMPONENT})
set(MG_JARS
"${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApiEx.jar"
Modified: trunk/MgDev/Web/src/PhpApi/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/PhpApi/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Web/src/PhpApi/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -57,7 +57,7 @@
add_library(php_MapGuideApi${MG_VERSION_SUFFIX} SHARED ${php_MapGuideApi_SRCS})
add_dependencies(php_MapGuideApi${MG_VERSION_SUFFIX} swig IMake php)
install(TARGETS php_MapGuideApi${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libphp_MapGuideApi${MG_VERSION_SUFFIX}.so libphp_MapGuideApi.so ${MG_COMPONENT})
+install_symlink(libphp_MapGuideApi${MG_VERSION_SUFFIX}.so libphp_MapGuideApi.so ${MG_COMPONENT})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/constants.php DESTINATION ${MG_WWWROOT}/mapadmin COMPONENT ${MG_COMPONENT})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/constants.php DESTINATION ${MG_WWWROOT}/mapviewerphp COMPONENT ${MG_COMPONENT})
Modified: trunk/MgDev/Web/src/WebApp/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/WebApp/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Web/src/WebApp/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -40,7 +40,7 @@
add_library(MgWebApp${MG_VERSION_SUFFIX} SHARED ${MgWebApp_SRCS})
install(TARGETS MgWebApp${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgWebApp${MG_VERSION_SUFFIX}.so libMgWebApp.so ${MG_COMPONENT})
+install_symlink(libMgWebApp${MG_VERSION_SUFFIX}.so libMgWebApp.so ${MG_COMPONENT})
target_link_libraries(MgWebApp${MG_VERSION_SUFFIX}
${XERCESC_LIBRARIES}
Modified: trunk/MgDev/Web/src/WebSupport/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/WebSupport/CMakeLists.txt 2020-09-17 12:02:35 UTC (rev 9735)
+++ trunk/MgDev/Web/src/WebSupport/CMakeLists.txt 2020-09-19 15:40:27 UTC (rev 9736)
@@ -12,7 +12,7 @@
add_library(MgWebSupport${MG_VERSION_SUFFIX} SHARED ${MgWebSupport_SRCS})
install(TARGETS MgWebSupport${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgWebSupport${MG_VERSION_SUFFIX}.so libMgWebSupport.so ${MG_COMPONENT})
+install_symlink(libMgWebSupport${MG_VERSION_SUFFIX}.so libMgWebSupport.so ${MG_COMPONENT})
target_link_libraries(MgWebSupport${MG_VERSION_SUFFIX}
MgFoundation${MG_VERSION_SUFFIX}
More information about the mapguide-commits
mailing list