commit f0b89a9888df794d355db29107804e724b92048f
author Alexander Broekhuis <alexander.broekhuis@luminis.eu> Wed May 06 20:59:58 2020 +0200
committer Alexander Broekhuis <alexander.broekhuis@luminis.eu> Wed May 06 20:59:58 2020 +0200
tree 0111bff1962e13c3022e46be9084fdac23abcf77
parent ac0cf56a0cf5d227e2781db7f37c5867bf62f2c6

Added back effc++ flag. Moved gtest inclusion before the flags to prevent compiler failures due to w_error.

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e5378a..1f3f158 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,13 @@
     message( FATAL_ERROR "Building Celix using CMake 3.3 and makefiles is not supported due to a bug in the Makefile Generator (see Bug 15696). Please change the used CMake version - both, CMake 3.2 and CMake 3.4 are working fine. Or use a different generator (e.g. Ninja)." )
 ENDIF()
 
+if (ENABLE_TESTING)
+    find_package(GTest CONFIG QUIET)
+    if (NOT GTest_FOUND)
+        include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/AddGTest.cmake)
+    endif()
+endif ()
+
 set(ENABLE_W_ERROR ON)
 set(ENABLE_MORE_WARNINGS OFF)
 
@@ -41,7 +48,7 @@
     set(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 -fPIC ${CMAKE_C_FLAGS}")
     set(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti ${CMAKE_CXX_FLAGS}")
     set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
-    set(CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "-Wall -Wextra -Weffc++ ${CMAKE_CXX_FLAGS}")
     set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG ${CMAKE_C_FLAGS}")
     set(CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG ${CMAKE_CXX_FLAGS}")
 ENDIF()
@@ -116,13 +123,6 @@
 
 option(CELIX_USE_ZIP_INSTEAD_OF_JAR "Default Celix cmake command will use jar to package bundle (if found). This option enforces Celix to use zip instead." OFF)
 
-if (ENABLE_TESTING)
-    find_package(GTest CONFIG QUIET)
-    if (NOT GTest_FOUND)
-        include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/AddGTest.cmake)
-    endif()
-endif ()
-
 #Libraries and Launcher
 add_subdirectory(libs)