Changeset 5cd6bcf in nscp

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

Files:

• CMakeLists.txt (modified) (2 diffs)
• build.cmake (modified) (2 diffs)
• libs/cryptopp/CMakeLists.txt (modified) (1 diff)
• modules/CheckDisk/CMakeLists.txt (added)

CMakeLists.txt

@@ -37 +37 @@
 SET(PROTOBUF_DIR "${INC_PROTOBUF_DIR}" CACHE PATH "Path to google protocol buffer root")
 IF(WIN32 AND MSVC)
-  SET(PROTOBUF_INCLUDE_DIR "${PROTOBUF_DIR}/src" CACHE PATH "Path to google protocol buffer source")
-  SET(PROTOBUF_LIBRARYDIR "${PROTOBUF_DIR}/vsprojects/Release")
-  SET(PROTOBUF_BINARYDIR "${PROTOBUF_DIR}/vsprojects/Release")
+  SET(PROTOBUF_INCLUDE_DIR "${PROTOBUF_DIR}/src" "Path to google protocol buffer source")
+  SET(PROTOBUF_LIBRARYDIR "${PROTOBUF_DIR}/vsprojects/x64/Release")
+  SET(PROTOBUF_BINARYDIR "${PROTOBUF_DIR}/vsprojects/debug")
 ELSE(WIN32 AND MSVC)
 # TODO
@@ -169 +169 @@
 
 SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0400)
+# TODO: Fix this issue! (crypto++ and masm)
+IF (WIN32)
+  SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DCRYPTOPP_DISABLE_ASM)
+ENDIF (WIN32)
+
 
 IF(CMAKE_HOST_UNIX)

build.cmake

@@ -9 +9 @@
 #SET(Boost_VERSION 1.40)
 
-SET(INC_NSCP_LIBRARYDIR C:/source/lib/x86)
+SET(INC_NSCP_LIBRARYDIR C:/source/lib/x64)
 SET(INC_NSCP_INCLUDEDIR C:/source/include)
 
@@ -19 +19 @@
 
 SET(INC_PROTOBUF_DIR "c:/source/libraries/protobuf-2.3.0")
+
 SET(INC_CRYPTOPP_DIR "c:/source/libraries/cryptopp-5.6.0")
 

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})