Commit 616eb031 authored by jcfr's avatar jcfr
Browse files

COMP: Fix macro slicerInstallLibrary - Apple is now handled like UNIX

As described below, the previous code specific to APPLE was
improperly specifying the path:

/Users/pieper/Downloads/Slicer-4.0.beta-r15645-Darwin
common:Slicer-4.0.beta-r15645-Darwin pieper$ find . -iname libarc\*
./lib/Slicer3/Users/partyd/Kitware/Slicer/build/libarchive-install
./lib/Slicer3/Users/partyd/Kitware/Slicer/build/libarchive-install/lib/libarchive.8.dylib
./lib/Slicer3/Users/partyd/Kitware/Slicer/build/libarchive-install/lib/libarchive.a
./lib/Slicer3/Users/partyd/Kitware/Slicer/build/libarchive-install/lib/libarchive.dylib

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15648 3bd1e089-480b-0410-8dfb-8563597acbee
parent e6fe8c03
......@@ -54,14 +54,10 @@ FUNCTION(slicerInstallLibrary)
SET(name_tmp)
# libs symlinks are always named lib.*.dylib on mac
# libs symlinks are always named lib.so.* on linux
IF (APPLE)
GET_FILENAME_COMPONENT(name_tmp ${_slicerInstallLibrary_FILE} NAME_WE)
FILE(GLOB lib_list "${dir_tmp}/${name_tmp}*")
ELSE()
GET_FILENAME_COMPONENT(dir_tmp ${_slicerInstallLibrary_FILE} PATH)
GET_FILENAME_COMPONENT(name_tmp ${_slicerInstallLibrary_FILE} NAME)
FILE(GLOB lib_list RELATIVE "${dir_tmp}" "${_slicerInstallLibrary_FILE}*")
ENDIF()
GET_FILENAME_COMPONENT(dir_tmp ${_slicerInstallLibrary_FILE} PATH)
GET_FILENAME_COMPONENT(name_tmp ${_slicerInstallLibrary_FILE} NAME)
FILE(GLOB lib_list RELATIVE "${dir_tmp}" "${_slicerInstallLibrary_FILE}*")
INSTALL(CODE "
MESSAGE(STATUS \"Installing ${name_tmp}\")
......
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