Move test options
@@ -32,7 +32,6 @@ IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 3.3 AND ${CMAKE_GENERATO
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()
-
# Options
option(ENABLE_TESTING "Enables unit/bundle testing" FALSE)
if (ENABLE_TESTING)
@@ -40,7 +39,6 @@ if (ENABLE_TESTING)
if (NOT GTest_FOUND)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/AddGTest.cmake)
endif()
- enable_testing()
endif ()
set(ENABLE_MORE_WARNINGS OFF)
@@ -124,6 +122,10 @@ set(CELIX_MICRO "1")
# Default bundle version
set(DEFAULT_VERSION 1.0.0)
+if (ENABLE_TESTING)
+ enable_testing()
+endif()
+
option(CELIX_INSTALL_DEPRECATED_API "whether to install (and use) deprecated apis (i.e. header without a celix_ prefix." ON)
option(CELIX_ADD_DEPRECATED_ATTRIBUTES "If enabled add deprecated attributes to deprecated services/functions." ON)
