Changeset 5cd6bcf in nscp for libs

Timestamp:

06/10/10 21:59:32 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

5735dda

Parents:

acf0660

Message:

More build subsystem changes

File:

• libs/cryptopp/CMakeLists.txt (modified) (1 diff)

libs/cryptopp/CMakeLists.txt

@@ -29 +29 @@
   # TODO add asm    echo $(.source)/x64masm.asm ;
   #   obj x64masm.obj : $(.source)/x64masm.asm ;
+  #enable_language(ASM_MASM)
+  #if(CMAKE_ASM_MASM_COMPILER_WORKS)
+  # set(can_use_assembler TRUE)
+  # SET(cryptopp_SOURCES ${cryptopp_SOURCES}  "${CRYPTOPP_SOURCE_DIR}/x64masm.asm")
+  #else(CMAKE_ASM_MASM_COMPILER_WORKS)
+  # MESSAGE(WARNING "Failed to find mnasm")
+  #endif(CMAKE_ASM_MASM_COMPILER_WORKS)
+  IF (WIN32)
+    ADD_DEFINITIONS (-DCRYPTOPP_DISABLE_ASM)
+    SET(Cryptopp_DEFINES -DCRYPTOPP_DISABLE_ASM)
+  ENDIF (WIN32)
 
   ADD_LIBRARY (cryptopp SHARED ${cryptopp_SOURCES})