Changeset acf0660 in nscp for build.cmake

Timestamp:

06/09/10 19:25:14 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

5cd6bcf

Parents:

86632db

Message:

renamed to_string as it clashed with some boost classes, as well as refactoring of the cmake build scripts to work better..

File:

• build.cmake (modified) (1 diff)

build.cmake

@@ -5 +5 @@
 set(Boost_USE_STATIC_LIBS   ON)
 set(BOOST_USE_MULTITHREADED ON)
+SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DBOOST_ALL_NO_LIB)  # THis is used to disable "automatic linking on windows which seems to break since I dont know how to set link dir
 #SET(BOOST_LIB_SUFFIX vc80-mt)
 #SET(Boost_VERSION 1.40)
 
-SET(INC_BOOST_INCLUDEDIR C:/source/include)
-SET(INC_BOOST_LIBRARYDIR C:/source/lib/x64)
+SET(INC_NSCP_LIBRARYDIR C:/source/lib/x86)
+SET(INC_NSCP_INCLUDEDIR C:/source/include)
+
+SET(INC_BOOST_INCLUDEDIR "${INC_NSCP_INCLUDEDIR}")
+SET(INC_BOOST_LIBRARYDIR "${INC_NSCP_LIBRARYDIR}")
 
 
-SET(INC_OPENSSL_INCLUDEDIR C:/source/include)
-SET(INC_NSCP_LIBRARYDIR C:/source/lib/x64)
+SET(INC_OPENSSL_INCLUDEDIR "${INC_NSCP_INCLUDEDIR}")
 
 SET(INC_PROTOBUF_DIR "c:/source/libraries/protobuf-2.3.0")