Testing the CMake cleanup before merge with develop

CMakeLists.txt

@@ -5,6 +5,12 @@
 # set the project name
 project (APEX CXX C)
 
+# The version number.
+set (APEX_DESCRIPTION "Autonomic Performance Environment for eXascale" CACHE STRING "APEX project description")
+set (APEX_VERSION_MAJOR 2 CACHE STRING "APEX Major Version")
+set (APEX_VERSION_MINOR 3 CACHE STRING "APEX Minor Version")
+set (APEX_HOMEPAGE_URL "http://github.com/khuck/xpress-apex" CACHE STRING "APEX homepage URL")
+
 cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
 cmake_policy(VERSION 2.8.12)
 if (${CMAKE_MAJOR_VERSION} GREATER 2)
@@ -252,10 +258,6 @@ endif (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "PGI")
 
 # ---------------------------------------------------
 
-# The version number.
-set (APEX_VERSION_MAJOR 2)
-set (APEX_VERSION_MINOR 3)
-
 # add_definitions(-std=c++11)
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17)

cmake/Modules/APEX_DefaultOptions.cmake

@@ -8,6 +8,7 @@ option (APEX_WITH_BFD "Enable Binutils (BFD)support" TRUE)
 option (APEX_WITH_CUDA "Enable CUDA (CUPTI) support" TRUE)
 option (APEX_WITH_MPI "Enable MPI support" TRUE)
 option (APEX_WITH_OMPT "Enable OpenMP Tools (OMPT) support" TRUE)
+option (APEX_WITH_OTF2 "Enable Open Trace Format 2 (OTF2) support" TRUE)
 option (APEX_WITH_PAPI "Enable PAPI support" FALSE)
 option (APEX_WITH_PLUGINS "Enable APEX policy plugin support" TRUE)
 option (APEX_WITH_TCMALLOC "Enable TCMalloc heap management" FALSE)
@@ -51,6 +52,12 @@ if(DEFINED USE_PAPI)
     set(APEX_WITH_PAPI CACHE BOOL ${USE_PAPI})
 endif()
 
+# Provide some backwards compatability
+if(DEFINED USE_OTF2)
+    message(WARNING "USE_OTF2 is deprecated - please use APEX_WITH_OTF2")
+    set(APEX_WITH_OTF2 CACHE BOOL ${USE_OTF2})
+endif()
+
 # Provide some backwards compatability
 if(DEFINED USE_PLUGINS)
     message(WARNING "USE_PLUGINS is deprecated - please use APEX_WITH_PLUGINS")

src/apex/CMakeLists.hpx

@@ -18,7 +18,7 @@ endif()
 hpx_info("apex" "Will build APEX")
 
 set (APEX_VERSION_MAJOR 2)
-set (APEX_VERSION_MINOR 1)
+set (APEX_VERSION_MINOR 3)
 
 if (NOT APEX_ROOT)
   if (EXISTS ${HPX_SOURCE_DIR}/apex)