blob: f9e1d29f15d85b10f43ac2354a160f2a999dadef (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
--- CMakeLists.txt.orig 2015-04-08 16:34:34 UTC
+++ CMakeLists.txt
@@ -44,7 +44,7 @@ SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
SET( LIB_SUFFIX "" CACHE STRING "The library directory suffix. 32bit empty string, 64 for 64bit." )
SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE INTERNAL "libary location" )
-SET( LIBDATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The library data directory" )
+SET( LIBDATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata" CACHE PATH "The library data directory" )
SET( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE INTERNAL "binary location" )
SET( SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share" CACHE INTERNAL "data location" )
SET( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE INTERNAL "headers location" )
@@ -191,7 +191,7 @@ MARK_AS_ADVANCED( CLEAR BUILD_DOCUMENTAT
# ADD_CUSTOM_TARGET( DoxygenDoc )
# ADD_DEPENDENCIES( DoxygenDoc DoxygenDocLibrary DoxygenDocTools )
#ENDIF ( BUILD_DOCUMENTATION )
-OPTION( ENABLE_INSTALL_DOC "install documentation" ON )
+OPTION( ENABLE_INSTALL_DOC "install documentation" OFF )
IF( ENABLE_INSTALL_DOC )
ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/BUGS )
ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/ChangeLog )
@@ -260,6 +260,3 @@ INCLUDE( CPack )
### CTest ########################################
ADD_SUBDIRECTORY( test/tools )
-IF(CHECK_FOUND)
- ADD_SUBDIRECTORY( test/api )
-ENDIF(CHECK_FOUND)
|
