cmake: simpler variable syntax

Author: scivision

CMakeLists.txt

@@ -16,17 +16,17 @@ add_library("${PROJECT_NAME}")
 set(OPENLIBM_ARCH_FOLDER ${CMAKE_SYSTEM_PROCESSOR})
 string(TOLOWER "${OPENLIBM_ARCH_FOLDER}" OPENLIBM_ARCH_FOLDER)
 
-if(${OPENLIBM_ARCH_FOLDER} STREQUAL "amd64" OR ${OPENLIBM_ARCH_FOLDER} STREQUAL "x86_64")
+if(OPENLIBM_ARCH_FOLDER STREQUAL "amd64" OR OPENLIBM_ARCH_FOLDER STREQUAL "x86_64")
     set(OPENLIBM_ARCH_FOLDER "amd64")
-elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "arm64" OR ${OPENLIBM_ARCH_FOLDER} STREQUAL "aarch64")
+elseif(OPENLIBM_ARCH_FOLDER STREQUAL "arm64" OR OPENLIBM_ARCH_FOLDER STREQUAL "aarch64")
     set(OPENLIBM_ARCH_FOLDER "aarch64")
-elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "armv7-a")
+elseif(OPENLIBM_ARCH_FOLDER STREQUAL "armv7-a")
     set(OPENLIBM_ARCH_FOLDER "arm")
-elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "x86" OR ${OPENLIBM_ARCH_FOLDER} STREQUAL "i686")
+elseif(OPENLIBM_ARCH_FOLDER STREQUAL "x86" OR OPENLIBM_ARCH_FOLDER STREQUAL "i686")
     set(OPENLIBM_ARCH_FOLDER "i387")
-elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "powerpc")
+elseif(OPENLIBM_ARCH_FOLDER STREQUAL "powerpc")
     set(OPENLIBM_ARCH_FOLDER "powerpc")
-elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "riscv64")
+elseif(OPENLIBM_ARCH_FOLDER STREQUAL "riscv64")
     set(OPENLIBM_ARCH_FOLDER "riscv64")
 else()
     message(FATAL_ERROR "${PROJECT_NAME} not set up for detected architecture: ${OPENLIBM_ARCH_FOLDER}")
@@ -40,18 +40,18 @@ list(APPEND C_ASM_COMPILE_FLAGS "-Wall" "-Wno-implicit-function-declaration")
 list(APPEND C_ASM_COMPILE_FLAGS "-DASSEMBLER" "-D__BSD_VISIBLE" "-O3")
 
 # Compiler-specific compile flags
-if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
+if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     list(APPEND C_ASM_COMPILE_FLAGS "-fno-strict-aliasing" "-ffp-exception-behavior=strict")
-elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
+elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     list(APPEND C_ASM_COMPILE_FLAGS "-fno-gnu89-inline")
 else()
     message(FATAL_ERROR "${PROJECT_NAME} not set up to be compiled with ${CMAKE_C_COMPILER_ID}")
 endif()
 
 # Architecture-specific compile flags - take advantage of sse on x86
-if(${OPENLIBM_ARCH_FOLDER} STREQUAL "i387")
+if(OPENLIBM_ARCH_FOLDER STREQUAL "i387")
     list(APPEND C_ASM_COMPILE_FLAGS "-march=i686" "-m32" "-msse2" "-mfpmath=sse")
-elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "amd64")
+elseif(OPENLIBM_ARCH_FOLDER STREQUAL "amd64")
     list(APPEND C_ASM_COMPILE_FLAGS "-m64" "-msse2" "-mfpmath=sse")
 endif()
 
@@ -249,7 +249,7 @@ list(APPEND OPENLIBM_C_SOURCE
 		"${PROJECT_SRC}/bsdsrc/b_tgamma.c"
 )
 
-if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
     list(APPEND OPENLIBM_C_SOURCE
             "${PROJECT_SRC}/src/s_nan.c"
     )
@@ -332,7 +332,7 @@ if(LONG_DOUBLE_NOT_DOUBLE)
 endif()
 
 if (LONG_DOUBLE_NOT_DOUBLE)
-    if (${OPENLIBM_ARCH_FOLDER} STREQUAL "i387" OR ${OPENLIBM_ARCH_FOLDER} STREQUAL "amd64")
+    if (OPENLIBM_ARCH_FOLDER STREQUAL "i387" OR OPENLIBM_ARCH_FOLDER STREQUAL "amd64")
         list(APPEND OPENLIBM_C_SOURCE
             # ld80
             "${PROJECT_SRC}/ld80/invtrig.c"
@@ -358,13 +358,13 @@ if (LONG_DOUBLE_NOT_DOUBLE)
             "${PROJECT_SRC}/ld80/s_erfl.c"
         )
 
-        if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+        if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
             list(APPEND OPENLIBM_C_SOURCE
                 "${PROJECT_SRC}/ld80/s_nanl.c"
             )
         endif()
     else()
-        if(${OPENLIBM_ARCH_FOLDER} STREQUAL "aarch64")
+        if(OPENLIBM_ARCH_FOLDER STREQUAL "aarch64")
             list(APPEND OPENLIBM_C_SOURCE
                 # ld128
                 "${PROJECT_SRC}/ld128/invtrig.c"
@@ -390,7 +390,7 @@ if (LONG_DOUBLE_NOT_DOUBLE)
                 "${PROJECT_SRC}/ld128/s_erfl.c"
             )
 
-            if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+            if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
                 list(APPEND OPENLIBM_C_SOURCE
                     "${PROJECT_SRC}/ld128/s_nanl.c"
                 )
@@ -400,7 +400,7 @@ if (LONG_DOUBLE_NOT_DOUBLE)
 endif()
 
 # Architecture-specific sources
-if (${OPENLIBM_ARCH_FOLDER} STREQUAL "amd64")
+if (OPENLIBM_ARCH_FOLDER STREQUAL "amd64")
     list(APPEND OPENLIBM_C_SOURCE
         "${PROJECT_SRC}/amd64/fenv.c"
     )
@@ -431,17 +431,17 @@ if (${OPENLIBM_ARCH_FOLDER} STREQUAL "amd64")
         "${PROJECT_SRC}/amd64/e_fmodl.S"
     )
 
-elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "aarch64")
+elseif(OPENLIBM_ARCH_FOLDER STREQUAL "aarch64")
     list(APPEND OPENLIBM_C_SOURCE
             "${PROJECT_SRC}/aarch64/fenv.c"
     )
 
-elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "arm")
+elseif(OPENLIBM_ARCH_FOLDER STREQUAL "arm")
     list(APPEND OPENLIBM_C_SOURCE
             "${PROJECT_SRC}/${OPENLIBM_ARCH_FOLDER}/fenv.c"
     )
 
-elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "i387")
+elseif(OPENLIBM_ARCH_FOLDER STREQUAL "i387")
     list(APPEND OPENLIBM_C_SOURCE
             "${PROJECT_SRC}/i387/fenv.c"
     )
@@ -493,19 +493,19 @@ elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "i387")
             "${PROJECT_SRC}/i387/s_truncl.S"
     )
 
-    if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+    if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
         list(APPEND OPENLIBM_ASM_SOURCE
                 "${PROJECT_SRC}/i387/s_scalbn.S"
                 "${PROJECT_SRC}/i387/s_scalbnf.S"
                 "${PROJECT_SRC}/i387/s_scalbnl.S"
         )
     endif()
 
-elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "powerpc")
+elseif(OPENLIBM_ARCH_FOLDER STREQUAL "powerpc")
         list(APPEND OPENLIBM_C_SOURCE
                 "${PROJECT_SRC}/powerpc/fenv.c"
         )
-elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "riscv64")
+elseif(OPENLIBM_ARCH_FOLDER STREQUAL "riscv64")
         list(APPEND OPENLIBM_C_SOURCE
                 "${PROJECT_SRC}/riscv64/fenv.c")
 else()
@@ -525,7 +525,7 @@ foreach(FILE_TO_REMOVE IN LISTS OPENLIBM_ASM_SOURCE)
         cmake_path(GET CUR_FILE FILENAME CUR_FILENAME)
         cmake_path(REMOVE_EXTENSION CUR_FILENAME)
 
-        if(${CUR_FILENAME} STREQUAL ${FILENAME_TO_REMOVE})
+        if(CUR_FILENAME STREQUAL ${FILENAME_TO_REMOVE})
             list(REMOVE_ITEM OPENLIBM_C_SOURCE ${CUR_FILE})
             message(DEBUG "Removed source file from compilation list: ${CUR_FILE}")
             break()
@@ -548,10 +548,10 @@ list(APPEND OPENLIBM_INCLUDE_DIRS
         "${PROJECT_SRC}/src"
 )
 
-if(${OPENLIBM_ARCH_FOLDER} STREQUAL "i387" OR ${OPENLIBM_ARCH_FOLDER} STREQUAL "amd64" OR ${OPENLIBM_ARCH_FOLDER} STREQUAL "powerpc")
+if(OPENLIBM_ARCH_FOLDER STREQUAL "i387" OR OPENLIBM_ARCH_FOLDER STREQUAL "amd64" OR OPENLIBM_ARCH_FOLDER STREQUAL "powerpc")
     list(APPEND OPENLIBM_INCLUDE_DIRS "${PROJECT_SRC}/ld80")
 else()
-    if(${OPENLIBM_ARCH_FOLDER} STREQUAL "aarch64" OR ${OPENLIBM_ARCH_FOLDER} STREQUAL "riscv64")
+    if(OPENLIBM_ARCH_FOLDER STREQUAL "aarch64" OR OPENLIBM_ARCH_FOLDER STREQUAL "riscv64")
         list(APPEND OPENLIBM_INCLUDE_DIRS "${PROJECT_SRC}/ld128")
     endif()
 endif()