45 lines
1.6 KiB
Plaintext
45 lines
1.6 KiB
Plaintext
$OpenBSD: patch-CMakeLists_txt,v 1.4 2011/07/03 18:49:17 ajacoutot Exp $
|
|
--- CMakeLists.txt.orig Sat Jul 2 15:22:18 2011
|
|
+++ CMakeLists.txt Sun Jul 3 19:26:14 2011
|
|
@@ -33,8 +33,8 @@ ENDIF()
|
|
|
|
|
|
IF(UNIX AND NOT WIN32)
|
|
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter") # additional C compile flags
|
|
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") # additional CPP compile flags
|
|
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unused-parameter") # additional C compile flags
|
|
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") # additional CPP compile flags
|
|
ELSE()
|
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fexceptions -fident -mthreads")
|
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-promo -fexceptions -fident -mthreads")
|
|
@@ -161,12 +161,12 @@ IF (BUILD_STATIC_PLUGINS)
|
|
## Library for loading FITS image files
|
|
FIND_PATH(CFITSIO_INCLUDE_DIR fitsio.h
|
|
/usr/include
|
|
- /usr/local/include
|
|
+ ${LOCALBASE}/include
|
|
DOC "Should point to the directory where the include files for libcfitsio are installed")
|
|
FIND_LIBRARY(CFITSIO_LIBRARIES cfitsio
|
|
PATHS
|
|
/usr/lib/
|
|
- /usr/local/lib
|
|
+ ${LOCALBASE}/lib
|
|
/opt/local/lib
|
|
DOC "cfitsio link options")
|
|
SET(QT_USE_QTXML TRUE) # For VirGO we also need QtXml module
|
|
@@ -210,12 +210,12 @@ IF(ENABLE_NLS)
|
|
PATHS
|
|
/usr/include
|
|
/sw/include
|
|
- /usr/local/include)
|
|
+ ${LOCALBASE}/include)
|
|
FIND_LIBRARY(INTL_LIBRARIES intl c
|
|
PATHS
|
|
/usr/lib/
|
|
/sw/lib
|
|
- /usr/local/lib) # NO_DEFAULT_PATH
|
|
+ ${LOCALBASE}/lib) # NO_DEFAULT_PATH
|
|
FIND_PACKAGE(Gettext REQUIRED)
|
|
FIND_PACKAGE(XGettext REQUIRED)
|
|
ENDIF()
|