diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cf6bd1b2..76b0a81e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,10 @@ cmake_minimum_required(VERSION 3.14) project(nitro) -set(CMAKE_CXX_STANDARD 14) -set(CXX_STANDARD_REQUIRED true) - if (${CMAKE_PROJECT_NAME} STREQUAL nitro) # we are the top-level project and are responsible for configuration + set(CMAKE_CXX_STANDARD 14) + set(CXX_STANDARD_REQUIRED true) # Always turn on "warnings as errors" to avoid lots of (meaningless?) build output; # we'll dial-back warnings as necessary. diff --git a/externals/coda-oss/CMakeLists.txt b/externals/coda-oss/CMakeLists.txt index f512d520a..cfdd0aa94 100644 --- a/externals/coda-oss/CMakeLists.txt +++ b/externals/coda-oss/CMakeLists.txt @@ -5,9 +5,6 @@ cmake_minimum_required(VERSION 3.14) project(coda-oss) -set(CMAKE_CXX_STANDARD 14) -set(CXX_STANDARD_REQUIRED true) - if (EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake") # build and package with conan include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake") @@ -19,6 +16,10 @@ endif() if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss) # this is the top level project + # Allow other project to set different standard. + set(CMAKE_CXX_STANDARD 14) + set(CXX_STANDARD_REQUIRED true) + # Always turn on "warnings as errors" to avoid lots of (meaningless?) build output; # we'll dial-back warnings as necessary. if (MSVC) diff --git a/modules/c/j2k/CMakeLists.txt b/modules/c/j2k/CMakeLists.txt index 854dad85a..cd20ec577 100644 --- a/modules/c/j2k/CMakeLists.txt +++ b/modules/c/j2k/CMakeLists.txt @@ -59,4 +59,4 @@ foreach(j2k_shared ${j2k_shared_srcs}) set_target_properties(${j2k_shared} PROPERTIES PREFIX "") endforeach() -install(TARGETS ${j2k_shared_srcs} DESTINATION "share/nitf/plugins") +install(TARGETS ${j2k_shared_srcs} DESTINATION "share/nitf/plugins" OPTIONAL) diff --git a/modules/c/nitf/CMakeLists.txt b/modules/c/nitf/CMakeLists.txt index a12260e1f..6bea3a7dd 100644 --- a/modules/c/nitf/CMakeLists.txt +++ b/modules/c/nitf/CMakeLists.txt @@ -105,6 +105,7 @@ set(tre_srcs ACCHZB CLCTNA CLCTNB CMETAA + CSATTB CSCCGA CSCRNA CSDIDA @@ -173,6 +174,7 @@ set(tre_srcs ACCHZB RSMPCA RSMPIA SECTGA + SECURA SENSRA SENSRB SNSPSB @@ -206,8 +208,12 @@ foreach(tre ${tre_srcs}) install(TARGETS ${tre_static} EXPORT ${CODA_EXPORT_SET_NAME} LIBRARY DESTINATION "lib" - ARCHIVE DESTINATION "lib") + ARCHIVE DESTINATION "lib" + OPTIONAL) endif() endforeach() -install(TARGETS ${tre_srcs} DESTINATION "share/nitf/plugins") +install(TARGETS ${tre_srcs} DESTINATION "share/nitf/plugins" OPTIONAL) + +add_custom_target(nitro-plugins) +add_dependencies(nitro-plugins ${tre_srcs}) \ No newline at end of file