[crisscross commit] r862 - in trunk: . TestSuite examples/CPSAT examples/CPUID examples/CheckMark examples/CheckMark/...

2 views

Skip to first unread message

codesite...@google.com

unread,

Oct 15, 2008, 7:55:15 PM10/15/08

to crisscr...@googlegroups.com

Author: steven.noonan
Date: Wed Oct 15 16:53:55 2008
New Revision: 862

Removed:
trunk/examples/CheckMark/CheckMark.xcodeproj/
Modified:
trunk/CMakeLists.txt
trunk/TestSuite/CMakeLists.txt
trunk/examples/CPSAT/CMakeLists.txt
trunk/examples/CPUID/CMakeLists.txt
trunk/examples/CheckMark/CMakeLists.txt
trunk/examples/EmptyProject/CMakeLists.txt
trunk/examples/GenPrime/CMakeLists.txt
trunk/examples/SimpleTCPClient/CMakeLists.txt
trunk/examples/SortBenchmark/CMakeLists.txt
trunk/source/CMakeLists.txt

Log:
VS projects now generate precompiled headers, hopefully.

Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Wed Oct 15 16:53:55 2008
@@ -29,7 +29,14 @@
ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
ENDIF(CMAKE_COMPILER_IS_GNUCXX)

-MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
+MACRO(ADD_PRECOMPILED_HEADER _targetName _header _sourceFile)
+IF(MSVC)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Yu\"${_header}\"")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Yu\"${_header}\"")
+ set_source_files_properties(_sourceFile
+ COMPILE_FLAGS "/Yc\"${_header}\""
+ )
+ENDIF(MSVC)
IF(CMAKE_COMPILER_IS_GNUCXX AND NOT XCODE)
IF(NOT CMAKE_BUILD_TYPE)
MESSAGE(FATAL_ERROR
@@ -112,13 +119,6 @@
# settings for Microsoft Visual C
IF(MSVC)
IF(NOT WITH_SHARED_LIBS)
- IF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
- SET(CMAKE_C_FLAGS "/nologo /W3 /GX /Gy /G6 /YX /Zi")
- SET(CMAKE_C_FLAGS_DEBUG "/MTd /Od")
- SET(CMAKE_C_FLAGS_RELEASE "/MT /O2")
- SET(CMAKE_C_FLAGS_MINSIZEREL "/MT /O2")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/MTd /Od")
- ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 7" OR CMAKE_GENERATOR
STREQUAL "Visual Studio 7 .NET 2003")
SET(CMAKE_C_FLAGS "/nologo /W3 /Gy /Gm /G6 /GS- /Zi")
SET(CMAKE_C_FLAGS_DEBUG "/MTd /Zi /Od")
@@ -138,13 +138,6 @@
# settings for Microsoft Visual C++
IF(MSVC)
IF(NOT WITH_SHARED_LIBS)
- IF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
- SET(CMAKE_CXX_FLAGS "/nologo /W3 /GX /Gy /G6 /YX /Zi")
- SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Od")
- SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2")
- SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Od")
- ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 7" OR CMAKE_GENERATOR
STREQUAL "Visual Studio 7 .NET 2003")
SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy /G6 /Gm /GS- /Zi /EHa")
SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Od")

Modified: trunk/TestSuite/CMakeLists.txt
==============================================================================
--- trunk/TestSuite/CMakeLists.txt (original)
+++ trunk/TestSuite/CMakeLists.txt Wed Oct 15 16:53:55 2008
@@ -1,4 +1,4 @@
add_executable(TestSuite avltree.cpp bubblesort.cpp combsort.cpp
compare.cpp darray.cpp datatypes.cpp dstack.cpp hashtable.cpp header.cpp
heapsort.cpp insertionsort.cpp llist.cpp main.cpp md2.cpp md4.cpp md5.cpp
quicksort.cpp rbtree.cpp sha1.cpp sha256.cpp sha512.cpp shellsort.cpp
splaytree.cpp stopwatch.cpp testutils.cpp tiger.cpp)
-add_precompiled_header(TestSuite ${CMAKE_CURRENT_SOURCE_DIR}/header.h)
+add_precompiled_header(TestSuite ${CMAKE_CURRENT_SOURCE_DIR}/header.h
${CMAKE_CURRENT_SOURCE_DIR}/header.cpp)

target_link_libraries (TestSuite CrissCross)

Modified: trunk/examples/CPSAT/CMakeLists.txt
==============================================================================
--- trunk/examples/CPSAT/CMakeLists.txt (original)
+++ trunk/examples/CPSAT/CMakeLists.txt Wed Oct 15 16:53:55 2008
@@ -1,4 +1,4 @@
add_executable(CPSAT header.cpp main.cpp rijndael-alg-fst.cpp rijndael.cpp)
-add_precompiled_header(CPSAT ${CMAKE_CURRENT_SOURCE_DIR}/header.h)
+add_precompiled_header(CPSAT ${CMAKE_CURRENT_SOURCE_DIR}/header.h
${CMAKE_CURRENT_SOURCE_DIR}/header.cpp)

target_link_libraries (CPSAT CrissCross)

Modified: trunk/examples/CPUID/CMakeLists.txt
==============================================================================
--- trunk/examples/CPUID/CMakeLists.txt (original)
+++ trunk/examples/CPUID/CMakeLists.txt Wed Oct 15 16:53:55 2008
@@ -1,4 +1,4 @@
add_executable(CPUID header.cpp main.cpp)
-add_precompiled_header(CPUID ${CMAKE_CURRENT_SOURCE_DIR}/header.h)
+add_precompiled_header(CPUID ${CMAKE_CURRENT_SOURCE_DIR}/header.h
${CMAKE_CURRENT_SOURCE_DIR}/header.cpp)

target_link_libraries (CPUID CrissCross)

Modified: trunk/examples/CheckMark/CMakeLists.txt
==============================================================================
--- trunk/examples/CheckMark/CMakeLists.txt (original)
+++ trunk/examples/CheckMark/CMakeLists.txt Wed Oct 15 16:53:55 2008
@@ -1,4 +1,4 @@
add_executable(CheckMark adler32.cpp crc32.cpp header.cpp main.cpp
random.cpp)
-add_precompiled_header(CheckMark ${CMAKE_CURRENT_SOURCE_DIR}/header.h)
+add_precompiled_header(CheckMark ${CMAKE_CURRENT_SOURCE_DIR}/header.h
${CMAKE_CURRENT_SOURCE_DIR}/header.cpp)

target_link_libraries (CheckMark CrissCross)

Modified: trunk/examples/EmptyProject/CMakeLists.txt
==============================================================================
--- trunk/examples/EmptyProject/CMakeLists.txt (original)
+++ trunk/examples/EmptyProject/CMakeLists.txt Wed Oct 15 16:53:55 2008
@@ -1,4 +1,4 @@
add_executable(EmptyProject header.cpp main.cpp)
-add_precompiled_header(EmptyProject ${CMAKE_CURRENT_SOURCE_DIR}/header.h)
+add_precompiled_header(EmptyProject ${CMAKE_CURRENT_SOURCE_DIR}/header.h
${CMAKE_CURRENT_SOURCE_DIR}/header.cpp)

target_link_libraries (EmptyProject CrissCross)

Modified: trunk/examples/GenPrime/CMakeLists.txt
==============================================================================
--- trunk/examples/GenPrime/CMakeLists.txt (original)
+++ trunk/examples/GenPrime/CMakeLists.txt Wed Oct 15 16:53:55 2008
@@ -1,4 +1,4 @@
add_executable(GenPrime header.cpp main.cpp)
-add_precompiled_header(GenPrime ${CMAKE_CURRENT_SOURCE_DIR}/header.h)
+add_precompiled_header(GenPrime ${CMAKE_CURRENT_SOURCE_DIR}/header.h
${CMAKE_CURRENT_SOURCE_DIR}/header.cpp)

target_link_libraries (GenPrime CrissCross)

Modified: trunk/examples/SimpleTCPClient/CMakeLists.txt
==============================================================================
--- trunk/examples/SimpleTCPClient/CMakeLists.txt (original)
+++ trunk/examples/SimpleTCPClient/CMakeLists.txt Wed Oct 15 16:53:55 2008
@@ -1,4 +1,4 @@
add_executable(SimpleTCPClient header.cpp main.cpp)
-add_precompiled_header(SimpleTCPClient
${CMAKE_CURRENT_SOURCE_DIR}/header.h)
+add_precompiled_header(SimpleTCPClient
${CMAKE_CURRENT_SOURCE_DIR}/header.h ${CMAKE_CURRENT_SOURCE_DIR}/header.cpp)

target_link_libraries (SimpleTCPClient CrissCross)

Modified: trunk/examples/SortBenchmark/CMakeLists.txt
==============================================================================
--- trunk/examples/SortBenchmark/CMakeLists.txt (original)
+++ trunk/examples/SortBenchmark/CMakeLists.txt Wed Oct 15 16:53:55 2008
@@ -1,4 +1,4 @@
add_executable(SortBenchmark header.cpp main.cpp)
-add_precompiled_header(SortBenchmark ${CMAKE_CURRENT_SOURCE_DIR}/header.h)
+add_precompiled_header(SortBenchmark ${CMAKE_CURRENT_SOURCE_DIR}/header.h
${CMAKE_CURRENT_SOURCE_DIR}/header.cpp)

target_link_libraries (SortBenchmark CrissCross)

Modified: trunk/source/CMakeLists.txt
==============================================================================
--- trunk/source/CMakeLists.txt (original)
+++ trunk/source/CMakeLists.txt Wed Oct 15 16:53:55 2008
@@ -12,7 +12,7 @@

add_custom_target(BuildNumber DEPENDS
${CrissCross_BINARY_DIR}/source/crisscross/build_number.h)
add_library(CrissCross console.cpp core_io_reader.cpp core_io_writer.cpp
core_network.cpp core_socket.cpp cpuid.cpp debug.cpp error.cpp
filereader.cpp filewriter.cpp md2.cpp md4.cpp md5.cpp mutex.cpp sha1.cpp
sha256.cpp sha512.cpp stopwatch.cpp system.cpp tcpsocket.cpp tiger.cpp
udpsocket.cpp universal_include.cpp version.cpp)
-add_precompiled_header(CrissCross
${CMAKE_CURRENT_SOURCE_DIR}/crisscross/universal_include.h)
+add_precompiled_header(CrissCross
${CMAKE_CURRENT_SOURCE_DIR}/crisscross/universal_include.h
${CMAKE_CURRENT_SOURCE_DIR}/universal_include.cpp)
add_dependencies(CrissCross BuildNumber)