Fix a notable amount of bugs

Author: DesWurstes

CMakeLists.txt

@@ -45,14 +45,14 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W")
 set(WARN_C_FLAGS "-std=c89 -pedantic -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wstrict-prototypes -Wno-unused-function -Wno-long-long -Wno-overlength-strings")
 set(SAVED_C_FLAGS "${CMAKE_C_FLAGS}")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARN_C_FLAGS}")
-check_c_compiler_flag(CMAKE_C_FLAGS USE_WARN_CFLAGS)
+check_c_compiler_flag(${CMAKE_C_FLAGS} USE_WARN_CFLAGS)
 if (NOT USE_WARN_CFLAGS)
     set(CMAKE_C_FLAGS "${SAVED_C_FLAGS}")
 endif()
 
 set(SAVED_C_FLAGS "${CMAKE_C_FLAGS}")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
-check_c_compiler_flag(CMAKE_C_FLAGS USE_OPAQUE_CFLAGS)
+check_c_compiler_flag(${CMAKE_C_FLAGS} USE_OPAQUE_CFLAGS)
 if (NOT USE_OPAQUE_CFLAGS)
     set(CMAKE_C_FLAGS "${SAVED_C_FLAGS}")
 endif()
@@ -117,8 +117,8 @@ if (NOT ASM_NO)
             check_c_source_compiles("\
             #include <stdint.h> \n\
             uint64_t a = 11, tmp; \n\
-            int main(void) {__asm__ __volatile__(\"movq \\@S|@0x100000000,%1; mulq %%rsi\" : \"+a\"(a) : \"S\"(tmp) : \"cc\", \"%rdx\");return 0;}" 64BIT_ASM_CHECK)
-            if (64BIT_ASM_CHECK)
+            int main(void) {__asm__ __volatile__(\"movq 0x100000000,%1; mulq %%rsi\" : \"+a\"(a) : \"S\"(tmp) : \"cc\", \"%rdx\");return 0;}" CHECK_ASM_64BIT)
+            if (CHECK_ASM_64BIT)
                 set(ASM_x86_64 ON)
             else()
                 set(ASM_NO ON)
@@ -128,8 +128,8 @@ if (NOT ASM_NO)
         check_c_source_compiles("\
         #include <stdint.h> \n\
         uint64_t a = 11, tmp; \n\
-        int main(void) {__asm__ __volatile__(\"movq \\@S|@0x100000000,%1; mulq %%rsi\" : \"+a\"(a) : \"S\"(tmp) : \"cc\", \"%rdx\");return 0;}" 64BIT_ASM_CHECK)
-        if (NOT 64BIT_ASM_CHECK)
+        int main(void) {__asm__ __volatile__(\"movq 0x100000000,%1; mulq %%rsi\" : \"+a\"(a) : \"S\"(tmp) : \"cc\", \"%rdx\");return 0;}" CHECK_ASM_64BIT)
+        if (NOT CHECK_ASM_64BIT)
             message(FATAL_ERROR "x86_64 assembly optimization requested but not available.")
         endif()
     endif()
@@ -337,6 +337,9 @@ else()
     endif()
 endif()
 
+# Use -DBUILD_SHARED_LIBS=ON to generate SHARED library
+
 add_subdirectory(src)
 
-# What should be here?
+set_target_properties(secp256k1 PROPERTIES PUBLIC_HEADER include/secp256k1.h)
+set_target_properties(secp256k1 PROPERTIES OUTPUT_NAME secp256k1)

src/CMakeLists.txt

@@ -1,14 +1,21 @@
 include_directories(${PROJECT_SOURCE_DIR})
-include_directories(${PROJECT_SOURCE_DIR}/include)
 
-if (PRECOMP)
-    add_custom_target(precomputation gen_context.c)
-    execute_process(COMMAND "${PROJECT_SOURCE_DIR}/src/precomputation" WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}")
-endif()
-add_library(libsecp256k1 STATIC secp256k1.c)
+add_library(secp256k1 secp256k1.c)
 if (TESTS)
-    add_custom_target(test tests.c)
+    add_executable(test tests.c)
 endif()
 if (EXHAUSTIVE_TESTS)
-    add_custom_target(exhaustive_test tests.c)
+    add_executable(exhaustive_test tests_exhaustive.c)
+endif()
+
+if (PRECOMP)
+    add_executable(precomputation gen_context.c)
+    add_dependencies(secp256k1 precomputation)
+    if (TESTS)
+        add_dependencies(test precomputation)
+    endif()
+    if (EXHAUSTIVE_TESTS)
+        add_dependencies(exhaustive_test precomputation)
+    endif()
+    execute_process(COMMAND "${PROJECT_SOURCE_DIR}/src/precomputation" WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 endif()