File tqsl-CMakeLists.diff of Package tqsl

Overview Repositories Revisions Requests Users Attributes Meta

File tqsl-CMakeLists.diff of Package tqsl (Revision 0255749839d3f4851f45ffbf0b2062c5)

Currently displaying revision 0255749839d3f4851f45ffbf0b2062c5 , Show latest

diff -urN tqsl-2.5.3_orig/apps/CMakeLists.txt tqsl-2.5.3/apps/CMakeLists.txt
--- tqsl-2.5.3_orig/apps/CMakeLists.txt	2020-04-11 21:53:46.000000000 +0000
+++ tqsl-2.5.3/apps/CMakeLists.txt	2020-04-11 23:30:10.150851722 +0000
@@ -57,13 +57,9 @@
 	set(TQSL_RCFILE ${OSX_ICONFILE})
 endif()
 
-if (NOT DEFINED TQSL_RPATH)
-	SET (TQSL_RPATH FALSE)
-endif ()
-
 if(NOT WIN32) #rpath setup
-	SET(CMAKE_SKIP_BUILD_RPATH ${TQSL_RPATH})
-	SET(CMAKE_BUILD_WITH_INSTALL_RPATH ${TQSL_RPATH}) 
+	SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+	SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
 	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 endif()
@@ -97,7 +93,11 @@
 if(NOT APPLE AND NOT WIN32)
 	install(TARGETS tqsl DESTINATION bin)
 	install(DIRECTORY help DESTINATION share/TrustedQSL)
-	install(FILES tqsl.5 DESTINATION ${CMAKE_INSTALL_MANDIR}/man5)
+	if (CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+		install(FILES tqsl.5 DESTINATION share/man/man5)
+	else()
+		install(FILES tqsl.5 DESTINATION man/man5)
+	endif()
 	install(FILES icons/key48.png DESTINATION share/pixmaps RENAME TrustedQSL.png)
 	install(FILES lang/de/tqslapp.mo DESTINATION share/locale/de/LC_MESSAGES)
 	install(FILES lang/es/tqslapp.mo DESTINATION share/locale/es/LC_MESSAGES)
diff -urN tqsl-2.5.3_orig/CMakeLists.txt tqsl-2.5.3/CMakeLists.txt
--- tqsl-2.5.3_orig/CMakeLists.txt	2020-04-11 21:53:46.000000000 +0000
+++ tqsl-2.5.3/CMakeLists.txt	2020-04-11 23:27:56.308541163 +0000
@@ -6,27 +6,28 @@
   ADD_COMPILE_OPTIONS("-fPIC")
 endif( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
 
-SET (LINUX FALSE)
-IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    SET(LINUX TRUE)
-ENDIF ()
-
-SET (LIB_SUFFIX "")
-
-# Pre-set LIB_SUFFIX for 64-bit Linux platforms
-IF (LINUX AND CMAKE_SHARED_LIBRARY_PREFIX STREQUAL "lib64")
+# Pre-set LIB_SUFFIX for 64-bit platforms
+IF (CMAKE_SHARED_LIBRARY_PREFIX STREQUAL "lib64")
   SET (LIB_SUFFIX "64")
 ENDIF()
 
 # Make sure that there's a value for LIB_SUFFIX
-IF (LINUX AND NOT CMAKE_SHARED_LIBRARY_PREFIX AND NOT LIB_SUFFIX) 
+IF (NOT CMAKE_SHARED_LIBRARY_PREFIX AND NOT LIB_SUFFIX) 
+  IF (NOT APPLE)
   # check 64 bit
     IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
       SET (LIB_SUFFIX "")
     ELSE (CMAKE_SIZEOF_VOID_P EQUAL 4)
       SET (LIB_SUFFIX "64")
     ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
-ENDIF (LINUX AND NOT CMAKE_SHARED_LIBRARY_PREFIX AND NOT LIB_SUFFIX) 
+  ELSE (NOT APPLE)
+    SET (LIB_SUFFIX "")
+  ENDIF (NOT APPLE)
+  # BSD does not use lib64 for 64bit libs
+  IF (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+    SET (LIB_SUFFIX "")
+  ENDIF()
+ENDIF (NOT CMAKE_SHARED_LIBRARY_PREFIX AND NOT LIB_SUFFIX) 
 
 if(WIN32)
   set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})

Places

File tqsl-CMakeLists.diff of Package tqsl (Revision 0255749839d3f4851f45ffbf0b2062c5)

Places