Merge pull request #133 from SimonRohou/codac2_dev

[cmake] corrected FAST_RELEASE config (closes #128)
codac-team · Nov 6, 2024 · 85197c5 · 85197c5
2 parents 15dca95 + b6bc7f4
commit 85197c5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -114,7 +114,8 @@
 ################################################################################
 
   if(FAST_RELEASE)
-    add_compile_definitions(FAST_RELEASE=1)
+    add_compile_definitions(FAST_RELEASE)
+    message(STATUS "You are running Codac in fast release mode. (option -DCMAKE_BUILD_TYPE=Release is required)")
   endif()
 
   add_subdirectory(src) # C++ sources

diff --git a/examples/01_batman/CMakeLists.txt b/examples/01_batman/CMakeLists.txt
@@ -38,6 +38,11 @@
 
 # Compilation
 
+  if(FAST_RELEASE)
+    add_compile_definitions(FAST_RELEASE)
+    message(STATUS "You are running Codac in fast release mode. (option -DCMAKE_BUILD_TYPE=Release is required)")
+  endif()
+
   add_executable(${PROJECT_NAME} main.cpp)
   target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS})
   target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS})

diff --git a/examples/02_centered_form/CMakeLists.txt b/examples/02_centered_form/CMakeLists.txt
@@ -38,6 +38,11 @@
 
 # Compilation
 
+  if(FAST_RELEASE)
+    add_compile_definitions(FAST_RELEASE)
+    message(STATUS "You are running Codac in fast release mode. (option -DCMAKE_BUILD_TYPE=Release is required)")
+  endif()
+
   add_executable(${PROJECT_NAME} main.cpp)
   target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS})
   target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS})

diff --git a/examples/03_sivia/CMakeLists.txt b/examples/03_sivia/CMakeLists.txt
@@ -38,6 +38,11 @@
 
 # Compilation
 
+  if(FAST_RELEASE)
+    add_compile_definitions(FAST_RELEASE)
+    message(STATUS "You are running Codac in fast release mode. (option -DCMAKE_BUILD_TYPE=Release is required)")
+  endif()
+
   add_executable(${PROJECT_NAME} main.cpp)
   target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS})
   target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS})

diff --git a/src/core/tools/codac2_assert.h b/src/core/tools/codac2_assert.h
@@ -18,7 +18,7 @@ namespace codac2
 {
   #if defined FAST_RELEASE & defined NDEBUG
 
-    #define assert_release(ignore_test,ignore_message) ((void)0)
+    #define assert_release(ignore_test) ((void)0)
 
   #else
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ namespace codac2 @@
     {
       #if defined FAST_RELEASE & defined NDEBUG
-        #define assert_release(ignore_test,ignore_message) ((void)0)
+        #define assert_release(ignore_test) ((void)0)
       #else
@@ Expand Down @@