[Traverso-commit] traverso CMakeLists.txt src/audiofileio/CMakeLi...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/11/05 22:28:11

Modified files:
        .              : CMakeLists.txt 
        src/audiofileio: CMakeLists.txt 
        src            : CMakeLists.txt 
        src/commands   : CMakeLists.txt 
        src/core       : CMakeLists.txt 
        src/engine     : CMakeLists.txt 
        src/plugins    : CMakeLists.txt 
        src/traverso   : CMakeLists.txt 
        src/traverso/songcanvas: CMakeLists.txt 

Log message:
        * fix an issue that shows up on 'older' cmake versions
        * only add pch header compile flags when pch is available

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/CMakeLists.txt?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CMakeLists.txt?cvsroot=traverso&r1=1.2&r2=1.3

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CMakeLists.txt      5 Nov 2007 20:19:11 -0000       1.2
+++ CMakeLists.txt      5 Nov 2007 22:28:10 -0000       1.3
@@ -67,7 +67,7 @@
   SET(CMAKE_C_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions -Wall")
   SET(BUILD_MAC_BUNDLE 1)
 ELSE(APPLE)
-  SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -Wall -include 
${CMAKE_SOURCE_DIR}/src/precompile.h -Winvalid-pch")
+  SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -Wall")
   SET(CMAKE_C_FLAGS_DEBUG "-O0 -g3 -Wall")
 ENDIF(APPLE)
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall")
@@ -148,6 +148,8 @@
     FIND_PACKAGE(PCHSupport)
     IF(PCHSupport_FOUND)
         SET(USE_PCH TRUE)
+        SET(CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} -include 
${CMAKE_SOURCE_DIR}/src/precompile.h -Winvalid-pch")
+        SET(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE} -include 
${CMAKE_SOURCE_DIR}/src/precompile.h -Winvalid-pch")
         MESSAGE(STATUS "Enabling precompiled headers for GCC 
${gcc_compiler_version}") 
     ENDIF(PCHSupport_FOUND)
 ELSE(WANT_PCH)

Index: src/audiofileio/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/audiofileio/CMakeLists.txt      5 Nov 2007 15:47:03 -0000       1.1
+++ src/audiofileio/CMakeLists.txt      5 Nov 2007 22:28:10 -0000       1.2
@@ -23,3 +23,6 @@
 
 ADD_LIBRARY(${TRAVERSO_AUDIOFILEIO_LIBRARY} STATIC 
${TRAVERSO_AUDIOFILEIO_SOURCES})
 
+IF(USE_PCH)
+    ADD_DEPENDENCIES(traversoaudiofileio precompiled_headers)
+ENDIF(USE_PCH)

Index: src/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/CMakeLists.txt  5 Nov 2007 15:47:03 -0000       1.1
+++ src/CMakeLists.txt  5 Nov 2007 22:28:10 -0000       1.2
@@ -1,12 +1,13 @@
-#Subdirectories
-ADD_SUBDIRECTORY(3rdparty ${CMAKE_SOURCE_DIR}/src/bin)
 ADD_SUBDIRECTORY(engine ${CMAKE_SOURCE_DIR}/src/bin)
 ADD_SUBDIRECTORY(audiofileio ${CMAKE_SOURCE_DIR}/src/bin)
 ADD_SUBDIRECTORY(commands ${CMAKE_SOURCE_DIR}/src/bin)
 ADD_SUBDIRECTORY(core ${CMAKE_SOURCE_DIR}/src/bin)
+ADD_SUBDIRECTORY(3rdparty ${CMAKE_SOURCE_DIR}/src/bin)
 ADD_SUBDIRECTORY(plugins ${CMAKE_SOURCE_DIR}/src/bin)
+ADD_SUBDIRECTORY(traverso/songcanvas ${CMAKE_SOURCE_DIR}/src/bin)
 ADD_SUBDIRECTORY(traverso ${CMAKE_SOURCE_DIR}/src/bin)
 
 IF(USE_PCH)
     ADD_PRECOMPILED_HEADER(precompiled_headers precompile.h)
 ENDIF(USE_PCH)
+

Index: src/commands/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/commands/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/commands/CMakeLists.txt 5 Nov 2007 17:26:22 -0000       1.2
+++ src/commands/CMakeLists.txt 5 Nov 2007 22:28:11 -0000       1.3
@@ -50,3 +50,6 @@
 
 ADD_LIBRARY(${TRAVERSO_COMMANDS_LIBRARY} STATIC ${TRAVERSO_COMMANDS_SOURCES} 
${TRAVERSO_COMMANDS_UI_SOURCES} ${TRAVERSO_COMMANDS_MOC_SOURCES})
 
+IF(USE_PCH)
+    ADD_DEPENDENCIES(traversocommands precompiled_headers)
+ENDIF(USE_PCH)

Index: src/core/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/core/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/core/CMakeLists.txt     5 Nov 2007 15:47:04 -0000       1.1
+++ src/core/CMakeLists.txt     5 Nov 2007 22:28:11 -0000       1.2
@@ -89,3 +89,6 @@
 
 ADD_LIBRARY(${TRAVERSO_CORE_LIBRARY} STATIC ${TRAVERSO_CORE_SOURCES} 
${TRAVERSO_CORE_MOC_SOURCES})
 
+IF(USE_PCH)
+    ADD_DEPENDENCIES(traversocore precompiled_headers)
+ENDIF(USE_PCH)

Index: src/engine/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/engine/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/engine/CMakeLists.txt   5 Nov 2007 15:47:04 -0000       1.1
+++ src/engine/CMakeLists.txt   5 Nov 2007 22:28:11 -0000       1.2
@@ -44,3 +44,6 @@
 
 ADD_LIBRARY(${TRAVERSO_ENGINE_LIBRARY} STATIC ${TRAVERSO_ENGINE_SOURCES} 
${TRAVERSO_ENGINE_MOC_SOURCES})
 
+IF(USE_PCH)
+    ADD_DEPENDENCIES(traversoaudiobackend precompiled_headers)
+ENDIF(USE_PCH)

Index: src/plugins/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/plugins/CMakeLists.txt  5 Nov 2007 15:47:04 -0000       1.1
+++ src/plugins/CMakeLists.txt  5 Nov 2007 22:28:11 -0000       1.2
@@ -39,3 +39,6 @@
 
 ADD_LIBRARY(${TRAVERSO_PLUGINS_LIBRARY} STATIC ${TRAVERSO_PLUGINS_SOURCES} 
${TRAVERSO_PLUGINS_MOC_SOURCES})
 
+IF(USE_PCH)
+    ADD_DEPENDENCIES(traversoplugins precompiled_headers)
+ENDIF(USE_PCH)

Index: src/traverso/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/traverso/CMakeLists.txt 5 Nov 2007 16:19:03 -0000       1.1
+++ src/traverso/CMakeLists.txt 5 Nov 2007 22:28:11 -0000       1.2
@@ -1,5 +1,3 @@
-ADD_SUBDIRECTORY(songcanvas ${CMAKE_SOURCE_DIR}/src/bin)
-
 INCLUDE_DIRECTORIES(
 ${CMAKE_SOURCE_DIR}/src/audiofileio/decode
 ${CMAKE_SOURCE_DIR}/src/audiofileio/encode
@@ -166,12 +164,5 @@
 ENDIF(HAVE_ALSA)
 
 IF(USE_PCH)
-    ADD_DEPENDENCIES(traversosongcanvas precompiled_headers)
-    ADD_DEPENDENCIES(traversocore precompiled_headers)
-    ADD_DEPENDENCIES(traversocommands precompiled_headers)
-    ADD_DEPENDENCIES(traversoaudiobackend precompiled_headers)
-    ADD_DEPENDENCIES(traversoplugins precompiled_headers)
-    ADD_DEPENDENCIES(traversoaudiofileio precompiled_headers)
-    ADD_DEPENDENCIES(tcp_traversocommands precompiled_headers)
+    ADD_DEPENDENCIES(traverso precompiled_headers)
 ENDIF(USE_PCH)
-

Index: src/traverso/songcanvas/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/traverso/songcanvas/CMakeLists.txt      5 Nov 2007 17:26:22 -0000       
1.2
+++ src/traverso/songcanvas/CMakeLists.txt      5 Nov 2007 22:28:11 -0000       
1.3
@@ -79,3 +79,6 @@
        ${TRAVERSO_SONGCANVAS_UI_SOURCES}
 )
 
+IF(USE_PCH)
+    ADD_DEPENDENCIES(traversosongcanvas precompiled_headers)
+ENDIF(USE_PCH)