diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cdf35fc771c96e87a524316422ce62f46e10b66..3a8aca4339d1c50e462c86b4d613cd11a5164366 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,12 +43,15 @@ ADD_REQUIRED_DEPENDENCY("hrp2-dynamics >= 1.1.0")
 # Add aggressive optimization flags in release mode.
 IF(CMAKE_COMPILER_IS_GNUCXX)
   SET (CMAKE_CXX_FLAGS_RELEASE
-    "-O3 -funroll-loops -frerun-loop-opt -fschedule-insns2"
-    "-frerun-cse-after-loop -falign-functions -falign-labels"
-    "-falign-loops -falign-jumps -fexpensive-optimizations")
+    "-O3 -funroll-loops -frerun-loop-opt -fschedule-insns2")
+  SET (CMAKE_CXX_FLAGS_RELEASE
+    "${CMAKE_CXX_FLAGS_RELEASE} -frerun-cse-after-loop -falign-functions")
+  SET (CMAKE_CXX_FLAGS_RELEASE
+    "${CMAKE_CXX_FLAGS_RELEASE} -falign-labels -falign-loops -falign-jumps")
+  SET (CMAKE_CXX_FLAGS_RELEASE
+    "${CMAKE_CXX_FLAGS_RELEASE} -fexpensive-optimizations")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tests)