diff --git a/CMakeLists.txt b/CMakeLists.txt index 92751cd..edb3ff8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,13 +12,13 @@ include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) -if(COMPILER_SUPPORTS_CXX11) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -elseif(COMPILER_SUPPORTS_CXX0X) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -else() - message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") -endif() +#if(COMPILER_SUPPORTS_CXX11) +# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +#elseif(COMPILER_SUPPORTS_CXX0X) +# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +#else() +# message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") +#endif() # We need g++ >= version 4.7 (see # http://stackoverflow.com/questions/4058565/check-gcc-minor-in-cmake) @@ -52,7 +52,7 @@ install(FILES ${PROJECT_BINARY_DIR}/config.hpp DESTINATION include/ctb) # Perform as many checks as possible on debug builds: # cmake -DCMAKE_BUILD_TYPE=Debug .. -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra --pedantic") +#set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra --pedantic") #set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra --pedantic") # Build and install libctb diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e8bb5a2..0ac9970 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,9 +9,9 @@ include_directories(${GDAL_INCLUDE_DIRS}) # unification. include(CheckLibraryExists) check_library_exists(gdal GDALOpenEx "gdal.h" HAVE_UNIFIED_GDAL) -if(NOT HAVE_UNIFIED_GDAL) - message(FATAL_ERROR "The GDAL version must be one that implements RFC 46 (GDAL/OGR unification) i.e. >= 2.0.0") -endif(NOT HAVE_UNIFIED_GDAL) +#if(NOT HAVE_UNIFIED_GDAL) +# message(FATAL_ERROR "The GDAL version must be one that implements RFC 46 (GDAL/OGR unification) i.e. >= 2.0.0") +#endif(NOT HAVE_UNIFIED_GDAL) # We need zlib find_package(ZLIB)