More cmake modernization updates

NREL · Dec 13, 2020 · d7ffe27 · nealkruis · Sep 21, 2021 · d7ffe27
1 parent 12f191a
commit d7ffe27
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake
@@ -9,8 +9,6 @@ endif()
 # Make sure expat is compiled as a static library
 target_compile_definitions(project_options INTERFACE "-DXML_STATIC")
 
-set(CMAKE_CXX_STANDARD 17)
-
 if(APPLE)
   # Force no auto ptr
   # TODO remove this after kiva/boost is updated to a version that supports
@@ -81,8 +79,8 @@ elseif(
   target_compile_options(project_warnings INTERFACE "-Wno-delete-non-virtual-dtor")
   target_compile_options(project_warnings INTERFACE "-Wno-missing-braces")
   if(CMAKE_COMPILER_IS_GNUCXX) # g++
-    target_compile_options(project_warnings INTERFACE "-Wno-unused-but-set-parameter" "-Wno-unused-but-set-variable"
-    )# Suppress unused-but-set warnings until more serious ones are addressed
+    target_compile_options(project_warnings INTERFACE "-Wno-unused-but-set-parameter" "-Wno-unused-but-set-variable")
+    # Suppress unused-but-set warnings until more serious ones are addressed
     target_compile_options(project_warnings INTERFACE "-Wno-maybe-uninitialized")
     target_compile_options(project_warnings INTERFACE "-Wno-aggressive-loop-optimizations")
   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")

diff --git a/cmake/ProjectMacros.cmake b/cmake/ProjectMacros.cmake
@@ -32,18 +32,19 @@ endmacro()
 macro(CREATE_TEST_TARGETS BASE_NAME SRC DEPENDENCIES)
   if(BUILD_TESTING)
 
-    if(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-      # Disabled Warnings:
-      # 1684 conversion from pointer to same-sized integral type (potential portability problem) - Due to gtest...
-      add_cxx_definitions("-diag-disable:1684")
-    endif()
-
     add_executable(${BASE_NAME}_tests ${SRC})
     target_link_libraries(${BASE_NAME}_tests PRIVATE project_options)
     if(ENABLE_GTEST_DEBUG_MODE)
       target_compile_definitions(${BASE_NAME}_tests PRIVATE ENABLE_GTEST_DEBUG_MODE)
     endif()
 
+    if(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+      # Disabled Warnings:
+      # 1684 conversion from pointer to same-sized integral type (potential portability problem) - Due to gtest...
+      target_compile_options(${BASE_NAME}_tests PRIVATE -diag-disable:1684)
+    endif()
+
+
     create_src_groups("${SRC}")
 
     get_target_property(BASE_NAME_TYPE ${BASE_NAME} TYPE)
@@ -168,17 +169,6 @@ function(ADD_SIMULATION_TEST)
 
 endfunction()
 
-macro(ADD_CXX_DEFINITIONS NEWFLAGS)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NEWFLAGS}")
-endmacro()
-
-macro(ADD_CXX_DEBUG_DEFINITIONS NEWFLAGS)
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${NEWFLAGS}")
-endmacro()
-
-macro(ADD_CXX_RELEASE_DEFINITIONS NEWFLAGS)
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${NEWFLAGS}")
-endmacro()
 
 function(fixup_executable EXECUTABLE_PATH)
   include(GetPrerequisites)

diff --git a/src/EnergyPlus/CMakeLists.txt b/src/EnergyPlus/CMakeLists.txt
@@ -1009,7 +1009,9 @@ if(BUILD_TESTING)
   file(MAKE_DIRECTORY ${TEST_DIR})
   add_executable(TestAPI_Runtime_C
                  ${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestRuntime.c)
-  target_link_libraries(TestAPI_Runtime_C PRIVATE energyplusapi project_options project_warnings)
+  target_link_libraries(TestAPI_Runtime_C PRIVATE energyplusapi project_options )
+  target_compile_options(TestAPI_Runtime_C PRIVATE -Wall -Wextra -Wno-unused)
+
   add_test(NAME "API.TestRuntimeC" COMMAND TestAPI_Runtime_C -d "${TEST_DIR}"
                                            -w "${EPW_FILE}" -D "${IDF_FILE}")