update config files

Author: janm31415

CMakeLists.txt

@@ -11,13 +11,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-set(AVX512 OFF CACHE BOOL "Set ON for AVX-512, set OFF for AVX2.")
+set(VECTORFORTH_AVX512 OFF CACHE BOOL "Set ON for AVX-512, set OFF for AVX2.")
 
-set(SINCOS_METHOD "approximate" CACHE STRING  "Choose the method to compute sin/cos. Vectorclass is accurate. Approximate is least accurate but fastest. Lookup uses a lookup table and is faster than vectorclass but less accurate.")
+set(VECTORFORTH_SINCOS_METHOD "approximate" CACHE STRING  "Choose the method to compute sin/cos. Vectorclass is accurate. Approximate is least accurate but fastest. Lookup uses a lookup table and is faster than vectorclass but less accurate.")
 
-set_property(CACHE SINCOS_METHOD PROPERTY STRINGS vectorclass lookup approximate)
+set_property(CACHE VECTORFORTH_SINCOS_METHOD PROPERTY STRINGS vectorclass lookup approximate)
 
-message(STATUS "SINCOS_METHOD='${SINCOS_METHOD}'")
+message(STATUS "VECTORFORTH_SINCOS_METHOD='${VECTORFORTH_SINCOS_METHOD}'")
 
 add_subdirectory(asm)
 add_subdirectory(asm.tests)

sf/CMakeLists.txt

@@ -44,17 +44,17 @@ endif (UNIX)
 add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 
-if (AVX512)
+if (VECTORFORTH_AVX512)
 add_definitions(-DAVX512)
-endif (AVX512)
+endif (VECTORFORTH_AVX512)
 
-if (${SINCOS_METHOD} STREQUAL "lookup")
+if (${VECTORFORTH_SINCOS_METHOD} STREQUAL "lookup")
 add_definitions(-DSINCOSLOOKUP)
-endif (${SINCOS_METHOD} STREQUAL "lookup")
+endif (${VECTORFORTH_SINCOS_METHOD} STREQUAL "lookup")
 
-if (${SINCOS_METHOD} STREQUAL "approximate")
+if (${VECTORFORTH_SINCOS_METHOD} STREQUAL "approximate")
 add_definitions(-DSINCOSAPPROX)
-endif (${SINCOS_METHOD} STREQUAL "approximate")
+endif (${VECTORFORTH_SINCOS_METHOD} STREQUAL "approximate")
 
 include ("../jtk/jtk/jtk.cmake")
 

shaderforth/CMakeLists.txt

@@ -80,17 +80,17 @@ endif (UNIX)
 add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 
-if (AVX512)
+if (VECTORFORTH_AVX512)
 add_definitions(-DAVX512)
-endif (AVX512)
+endif (VECTORFORTH_AVX512)
 
-if (${SINCOS_METHOD} STREQUAL "lookup")
+if (${VECTORFORTH_SINCOS_METHOD} STREQUAL "lookup")
 add_definitions(-DSINCOSLOOKUP)
-endif (${SINCOS_METHOD} STREQUAL "lookup")
+endif (${VECTORFORTH_SINCOS_METHOD} STREQUAL "lookup")
 
-if (${SINCOS_METHOD} STREQUAL "approximate")
+if (${VECTORFORTH_SINCOS_METHOD} STREQUAL "approximate")
 add_definitions(-DSINCOSAPPROX)
-endif (${SINCOS_METHOD} STREQUAL "approximate")
+endif (${VECTORFORTH_SINCOS_METHOD} STREQUAL "approximate")
 
 include ("../jtk/jtk/jtk.cmake")
 

vectorforth.tests/CMakeLists.txt

@@ -38,17 +38,17 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 
 add_definitions(-DMEMORY_LEAK_TRACKING)
 
-if (AVX512)
+if (VECTORFORTH_AVX512)
 add_definitions(-DAVX512)
-endif (AVX512)
+endif (VECTORFORTH_AVX512)
 
-if (${SINCOS_METHOD} STREQUAL "lookup")
+if (${VECTORFORTH_SINCOS_METHOD} STREQUAL "lookup")
 add_definitions(-DSINCOSLOOKUP)
-endif (${SINCOS_METHOD} STREQUAL "lookup")
+endif (${VECTORFORTH_SINCOS_METHOD} STREQUAL "lookup")
 
-if (${SINCOS_METHOD} STREQUAL "approximate")
+if (${VECTORFORTH_SINCOS_METHOD} STREQUAL "approximate")
 add_definitions(-DSINCOSAPPROX)
-endif (${SINCOS_METHOD} STREQUAL "approximate")
+endif (${VECTORFORTH_SINCOS_METHOD} STREQUAL "approximate")
 
 add_executable(vectorforth.tests ${HDRS} ${SRCS})
 source_group("Header Files" FILES ${hdrs})
@@ -66,4 +66,4 @@ target_link_libraries(vectorforth.tests
     PRIVATE
     asm
     vectorforth
-    )	
+    )	

vectorforth/CMakeLists.txt

@@ -58,17 +58,17 @@ endif (UNIX)
 add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 
-if (AVX512)
+if (VECTORFORTH_AVX512)
 add_definitions(-DAVX512)
-endif (AVX512)
+endif (VECTORFORTH_AVX512)
 
-if (${SINCOS_METHOD} STREQUAL "lookup")
+if (${VECTORFORTH_SINCOS_METHOD} STREQUAL "lookup")
 add_definitions(-DSINCOSLOOKUP)
-endif (${SINCOS_METHOD} STREQUAL "lookup")
+endif (${VECTORFORTH_SINCOS_METHOD} STREQUAL "lookup")
 
-if (${SINCOS_METHOD} STREQUAL "approximate")
+if (${VECTORFORTH_SINCOS_METHOD} STREQUAL "approximate")
 add_definitions(-DSINCOSAPPROX)
-endif (${SINCOS_METHOD} STREQUAL "approximate")
+endif (${VECTORFORTH_SINCOS_METHOD} STREQUAL "approximate")
 
 add_library(vectorforth SHARED ${HDRS} ${SRCS})
 source_group("Header Files" FILES ${hdrs})