diff --git a/cmake/compiler_options.cmake b/cmake/compiler_options.cmake index 6032cffe6b..bd7e074398 100644 --- a/cmake/compiler_options.cmake +++ b/cmake/compiler_options.cmake @@ -4,6 +4,10 @@ include_directories(${PDAL_SRC_DIR}) include_directories(${PDAL_IO_DIR}) include_directories(${PDAL_KERNEL_DIR}) include_directories(${PDAL_FILTER_DIR}) + +set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE) + if (WIN32) include (${CMAKE_CURRENT_LIST_DIR}/win32_compiler_options.cmake) else() diff --git a/cmake/win32_compiler_options.cmake b/cmake/win32_compiler_options.cmake index ffb91eb585..ecbcc1a394 100644 --- a/cmake/win32_compiler_options.cmake +++ b/cmake/win32_compiler_options.cmake @@ -68,15 +68,6 @@ if (MSVC) endif(MSVC) add_definitions(-DWIN32_LEAN_AND_MEAN) -# note we default to debug mode -#if(NOT MSVC_IDE) -# if(NOT CMAKE_BUILD_TYPE) -# set(CMAKE_BUILD_TYPE Debug CACHE STRING -# "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE) -# endif() -# message(STATUS "Setting PDAL build type - ${CMAKE_BUILD_TYPE}") -#endif() - set(CMAKE_INCLUDE_PATH "c:/OSGeo4W64/include;$ENV{CMAKE_INCLUDE_PATH}") set(CMAKE_LIBRARY_PATH "c:/OSGeo4W64/lib;$ENV{CMAKE_LIBRARY_PATH}") set(CMAKE_PREFIX_PATH "c:/OSGeo4W64/cmake;$ENV{CMAKE_LIBRARY_PATH}") diff --git a/src/Kernel.cpp b/src/Kernel.cpp index 59371a6724..de07cac40f 100644 --- a/src/Kernel.cpp +++ b/src/Kernel.cpp @@ -239,10 +239,11 @@ void Kernel::collectExtraOptions() option_split.push_back(boost::lexical_cast(ti)); if (!(option_split.size() == 2)) { - std::ostringstream oss; - oss << "option '" << o << "' did not split correctly. Is it " - "in the form --readers.las.option=foo?"; - throw app_usage_error(oss.str()); +// std::ostringstream oss; +// oss << "option '" << o << "' did not split correctly. Is it " +// "in the form --readers.las.option=foo?"; +// throw app_usage_error(oss.str()); + continue; } std::string option_value(option_split[1]);