1
0
Эх сурвалжийг харах

ENH: add more search paths and add UnixPaths to all unix platforms

Bill Hoffman 20 жил өмнө
parent
commit
d33021924d

+ 1 - 0
Modules/Platform/FreeBSD.cmake

@@ -9,3 +9,4 @@ IF(EXISTS /usr/include/dlfcn.h)
   SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
 ENDIF(EXISTS /usr/include/dlfcn.h)
 # include the gcc flags 
+INCLUDE(Platform/UnixPaths)

+ 1 - 0
Modules/Platform/HP-UX.cmake

@@ -70,3 +70,4 @@ ELSE(CMAKE_COMPILER_IS_GNUCXX)
   SET (CMAKE_C_FLAGS_INIT "")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 # set flags for gcc support
+INCLUDE(Platform/UnixPaths)

+ 1 - 0
Modules/Platform/IRIX.cmake

@@ -14,3 +14,4 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX)
   SET (CMAKE_C_FLAGS_INIT "")
 ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
 # set flags for gcc support
+INCLUDE(Platform/UnixPaths)

+ 1 - 0
Modules/Platform/IRIX64.cmake

@@ -43,3 +43,4 @@ IF(NOT CMAKE_COMPILER_IS_GNUCC)
   SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
   SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2")
 ENDIF(NOT CMAKE_COMPILER_IS_GNUCC)
+INCLUDE(Platform/UnixPaths)

+ 1 - 0
Modules/Platform/NetBSD.cmake

@@ -6,3 +6,4 @@ IF(EXISTS /usr/include/dlfcn.h)
   SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")       # -rpath
   SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
 ENDIF(EXISTS /usr/include/dlfcn.h)
+INCLUDE(Platform/UnixPaths)

+ 1 - 0
Modules/Platform/OSF1.cmake

@@ -42,3 +42,4 @@ ELSE (CMAKE_COMPILER_IS_GNUCXX)
   SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
   SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+INCLUDE(Platform/UnixPaths)

+ 1 - 0
Modules/Platform/SCO_SV.cmake

@@ -2,3 +2,4 @@ SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-Kpic -belf")
 SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-Kpic -belf")
 SET(CMAKE_DL_LIBS "")
 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-belf -Wl,-Bexport")  
+INCLUDE(Platform/UnixPaths)

+ 1 - 1
Modules/Platform/SINIX.cmake

@@ -1,2 +1,2 @@
 SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-K PIC")
-
+INCLUDE(Platform/UnixPaths)

+ 1 - 0
Modules/Platform/Tru64.cmake

@@ -1 +1,2 @@
+INCLUDE(Platform/UnixPaths)
 

+ 1 - 0
Modules/Platform/ULTRIX.cmake

@@ -2,3 +2,4 @@ SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-G 0")
 SET(CMAKE_SHARED_LIBRARY_SUFFIX "..o") 
 SET(CMAKE_DL_LIBS "")
 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-D,08000000")
+INCLUDE(Platform/UnixPaths)

+ 1 - 0
Modules/Platform/UNIX_SV.cmake

@@ -1,2 +1,3 @@
 SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-K PIC")
 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-Bexport")
+INCLUDE(Platform/UnixPaths)

+ 4 - 3
Modules/Platform/UnixPaths.cmake

@@ -1,5 +1,6 @@
 SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} /usr/include  
-  /usr/local/include /usr/local /usr/X11R6/include /usr/include/X11)
+  /usr/local/include /usr/local /usr/X11R6/include /usr/include/X11 /usr/pkg/include)
 SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} /lib /usr/lib /usr/local/lib 
-  /usr/lib/w32api /usr/X11R6/lib /opt/local/lib /opt/csw/lib /opt/lib )
-SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} /bin /usr/bin /usr/local/bin /sbin)
+  /usr/lib/w32api /usr/X11R6/lib /opt/local/lib /opt/csw/lib /opt/lib /usr/pkg/lib)
+SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} /bin /usr/bin /usr/local/bin
+  /usr/pkg/bin /sbin)

+ 1 - 0
Modules/Platform/UnixWare.cmake

@@ -1,2 +1,3 @@
 SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-K PIC")
 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-Wl,-Bexport")
+INCLUDE(Platform/UnixPaths)

+ 1 - 0
Modules/Platform/Xenix.cmake

@@ -1 +1,2 @@
+INCLUDE(Platform/UnixPaths)
 

+ 2 - 0
Modules/Platform/kFreeBSD.cmake

@@ -7,3 +7,5 @@ SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
 SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
 SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
 SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
+
+INCLUDE(Platform/UnixPaths)