[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso CMakeLists.txt cmake/modules/FindPCHSu...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso CMakeLists.txt cmake/modules/FindPCHSu... |
|
Date: |
Mon, 19 Nov 2007 14:04:25 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/11/19 14:04:25
Modified files:
. : CMakeLists.txt
cmake/modules : FindPCHSupport.cmake
src : CMakeLists.txt
src/commands : CMakeLists.txt
src/commands/plugins: CMakeLists.txt
Log message:
* make precompiled headers work with release build too
* out of source builds should work now too (though not with pch for
some reason...)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/cmake/modules/FindPCHSupport.cmake?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/CMakeLists.txt?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/CMakeLists.txt?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/CMakeLists.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- CMakeLists.txt 19 Nov 2007 11:18:52 -0000 1.13
+++ CMakeLists.txt 19 Nov 2007 14:04:24 -0000 1.14
@@ -49,6 +49,10 @@
ENDIF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
+
+# Static build is perfectly fine now, targets are properly relinked when
needed!
+SET(TRAVERSO_DEFINES -DSTATIC_BUILD)
+
#BUILD SETUP
#None, Debug, Release, .. or custom ones
IF(WANT_DEBUG)
@@ -56,19 +60,15 @@
SET(WANT_TRAVERSO_DEBUG ON)
ELSE(WANT_DEBUG)
SET(CMAKE_BUILD_TYPE RELEASE)
- ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ LIST(APPEND TRAVERSO_DEFINES -DQT_NO_DEBUG)
ENDIF(WANT_DEBUG)
IF(WANT_TRAVERSO_DEBUG)
- ADD_DEFINITIONS(-DUSE_DEBUGGER)
+ LIST(APPEND TRAVERSO_DEFINES -DUSE_DEBUGGER)
ENDIF(WANT_TRAVERSO_DEBUG)
-# Static build is perfectly fine now, targets are properly relinked when
needed!
-ADD_DEFINITIONS(-DSTATIC_BUILD)
-
-
# Moves the Traverso exec. to the root dir and libs to the root's lib dir.
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib)
@@ -114,7 +114,7 @@
IF(WANT_OPENGL)
IF(QT_QTOPENGL_FOUND)
- ADD_DEFINITIONS(-DQT_OPENGL_SUPPORT)
+ LIST(APPEND TRAVERSO_DEFINES -DQT_OPENGL_SUPPORT)
SET(HAVE_OPENGL TRUE)
ENDIF(QT_QTOPENGL_FOUND)
ELSE(WANT_OPENGL)
@@ -130,7 +130,7 @@
ENDIF(NOT HAVE_PORTAUDIO_H)
PKG_CHECK_MODULES(PORTAUDIO portaudio-2.0>=${MINIMAL_PORTAUDIO_VERSION})
IF(PORTAUDIO_FOUND)
- ADD_DEFINITIONS(-DPORTAUDIO_SUPPORT)
+ LIST(APPEND TRAVERSO_DEFINES -DPORTAUDIO_SUPPORT)
MESSAGE("-- PortAudio Library Found OK")
SET(HAVE_PORTAUDIO TRUE)
ENDIF(PORTAUDIO_FOUND)
@@ -160,7 +160,7 @@
SET(USE_INTERNAL_SLV2_LIB TRUE)
ENDIF(USE_SYSTEM_SLV2_LIBRARY)
- ADD_DEFINITIONS(-DLV2_SUPPORT)
+ LIST(APPEND TRAVERSO_DEFINES -DLV2_SUPPORT)
SET(HAVE_SLV2 TRUE)
ELSE(WANT_LV2)
SET(HAVE_SLV2 FALSE)
@@ -210,7 +210,7 @@
ENDIF(NOT HAVE_MAD_H)
PKG_CHECK_MODULES(MAD mad>=${MINIMAL_MAD_VERSION})
IF(MAD_FOUND)
- ADD_DEFINITIONS(-DMP3_DECODE_SUPPORT)
+ LIST(APPEND TRAVERSO_DEFINES -DMP3_DECODE_SUPPORT)
MESSAGE("-- MP3 Decoding Library Found OK")
SET(HAVE_MP3_DECODING TRUE)
ENDIF(MAD_FOUND)
@@ -224,7 +224,7 @@
IF(NOT HAVE_LAME_H)
MESSAGE(FATAL_ERROR "MP3 encoding support requested, but mp3
development headers (lame.h) could not be found!\nPlease install the lame
development package (Usually called liblame-dev), remove CMakeCache.txt and run
cmake again")
ENDIF(NOT HAVE_LAME_H)
- ADD_DEFINITIONS(-DMP3_ENCODE_SUPPORT)
+ LIST(APPEND TRAVERSO_DEFINES -DMP3_ENCODE_SUPPORT)
MESSAGE("-- Building with mp3 encoding support enabled")
SET(HAVE_MP3_ENCODING TRUE)
ENDIF(LAME_FOUND)
@@ -247,12 +247,12 @@
CHECK_INCLUDE_FILE("sys/vfs.h" HAVE_SYS_VFS_H)
IF(HAVE_SYS_VFS_H)
- ADD_DEFINITIONS(-DHAVE_SYS_VFS_H)
+ LIST(APPEND TRAVERSO_DEFINES -DHAVE_SYS_VFS_H)
ENDIF(HAVE_SYS_VFS_H)
CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
IF(HAVE_SYS_STAT_H)
- ADD_DEFINITIONS(-DHAVE_SYS_STAT_H)
+ LIST(APPEND TRAVERSO_DEFINES -DHAVE_SYS_STAT_H)
ENDIF(HAVE_SYS_STAT_H)
@@ -285,14 +285,14 @@
CHECK_FUNCTION_EXISTS(posix_memalign HAVE_POSIX_MEMALIGN)
IF(NOT HAVE_POSIX_MEMALIGN)
- ADD_DEFINITIONS(-DNO_POSIX_MEMALIGN)
+ LIST(APPEND TRAVERSO_DEFINES -DNO_POSIX_MEMALIGN)
MESSAGE("Did not find posix_memalign(), using malloc")
ENDIF(NOT HAVE_POSIX_MEMALIGN)
CHECK_FUNCTION_EXISTS(mlock HAVE_MLOCK)
IF(HAVE_MLOCK)
- ADD_DEFINITIONS(-DUSE_MLOCK)
+ LIST(APPEND TRAVERSO_DEFINES -DUSE_MLOCK)
ENDIF(HAVE_MLOCK)
@@ -303,22 +303,6 @@
IF(UNIX)
- # Check GCC for PCH support
- SET(USE_PCH FALSE)
- IF(WANT_PCH)
- 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)
- #QT_DEFENITIONS are added by pch, so when no pch support add them now!
- ADD_DEFINITIONS(${QT_DEFINITIONS})
- ENDIF(WANT_PCH)
-
-
#BEGIN Mac OS X section
IF(APPLE)
# @ MAC OS X builders, I've NO IDEA what this should be, please have a look at
it
@@ -334,7 +318,7 @@
IF(WANT_VECLIB_OPTIMIZATIONS)
- ADD_DEFINITIONS(-DBUILD_VECLIB_OPTIMIZATIONS)
+ LIST(APPEND TRAVERSO_DEFINES
-DBUILD_VECLIB_OPTIMIZATIONS)
LINK_LIBRARIES( "-framework Accelerate" )
ENDIF(WANT_VECLIB_OPTIMIZATIONS)
@@ -355,7 +339,7 @@
PKG_CHECK_MODULES(ALSA alsa>=${MINIMAL_ALSA_VERSION})
IF (ALSA_FOUND)
MESSAGE("-- ALSA Library Found OK")
- ADD_DEFINITIONS(-DALSA_SUPPORT)
+ LIST(APPEND TRAVERSO_DEFINES -DALSA_SUPPORT)
SET(HAVE_ALSA TRUE)
ENDIF(ALSA_FOUND)
ELSE(WANT_ALSA)
@@ -366,7 +350,7 @@
find_program(RELAYTOOL_EXECUTABLE NAMES relaytool)
IF(RELAYTOOL_EXECUTABLE)
- ADD_DEFINITIONS(-DRELAYTOOL_PRESENT)
+ LIST(APPEND TRAVERSO_DEFINES -DRELAYTOOL_PRESENT)
ENDIF(RELAYTOOL_EXECUTABLE)
# END LINUX section
@@ -380,7 +364,7 @@
PKG_CHECK_MODULES(JACK jack>=${MINIMAL_JACK_VERSION})
IF(JACK_FOUND)
- ADD_DEFINITIONS(-DJACK_SUPPORT)
+ LIST (APPEND TRAVERSO_DEFINES -DJACK_SUPPORT)
MESSAGE("-- Jack Library Found OK")
SET(HAVE_JACK TRUE)
SET(JACK_LIBS ${JACK_LIBRARIES})
@@ -414,7 +398,7 @@
IF(cat_invoke_result MATCHES sse)
SET(HOST_SUPPORTS_SSE TRUE)
- ADD_DEFINITIONS(-DSSE_OPTIMIZATIONS)
+ LIST(APPEND TRAVERSO_DEFINES -DSSE_OPTIMIZATIONS)
ENDIF(cat_invoke_result MATCHES sse)
IF(cat_invoke_result MATCHES mmx)
@@ -433,20 +417,20 @@
SET(uname_invoke_result "${CMAKE_CXX_FLAGS_RELEASE}
-march=i686")
IF(HOST_SUPPORTS_SSE)
SET(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} -msse -mfpmath=sse")
- ADD_DEFINITIONS(-DUSE_XMMINTRIN)
+ LIST(APPEND TRAVERSO_DEFINES -DUSE_XMMINTRIN)
ENDIF(HOST_SUPPORTS_SSE)
ENDIF(uname_invoke_result MATCHES i686)
IF(uname_invoke_result MATCHES x86_64)
IF(HOST_SUPPORTS_SSE)
SET(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} -msse -mfpmath=sse")
- ADD_DEFINITIONS(-DUSE_XMMINTRIN
-DUSE_X86_64_ASM)
+ LIST(APPEND TRAVERSO_DEFINES -DUSE_XMMINTRIN
-DUSE_X86_64_ASM)
SET(IS_ARCH_X86_64 TRUE)
ENDIF(HOST_SUPPORTS_SSE)
ENDIF(uname_invoke_result MATCHES x86_64)
IF(uname_invoke_result MATCHES i[456]86)
- ADD_DEFINITIONS(-DARCH_X86)
+ LIST(APPEND TRAVERSO_DEFINES -DARCH_X86)
SET(IS_ARCH_X86 TRUE)
ENDIF(uname_invoke_result MATCHES i[456]86)
ENDIF(NOT WANT_DEBUG)
@@ -459,7 +443,7 @@
LINK_LIBRARIES(
${QT_QTMAIN_LIBRARY}
)
- ADD_DEFINITIONS(-DQT_DLL -DWIN_BUILD -DPORTAUDIO_SUPPORT)
+ LIST (APPEND TRAVERSO_DEFINES -DQT_DLL -DWIN_BUILD
-DPORTAUDIO_SUPPORT)
ENDIF(WIN32)
@@ -467,10 +451,29 @@
IF(WANT_THREAD_CHECK)
- ADD_DEFINITIONS(-DTHREAD_CHECK)
+ LIST(APPEND TRAVERSO_DEFINES -DTHREAD_CHECK)
ENDIF(WANT_THREAD_CHECK)
+# Check GCC for PCH support
+SET(USE_PCH FALSE)
+
+IF(WANT_PCH)
+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)
+ #QT_DEFENITIONS are added by pch, so when no pch support add them now!
+ ADD_DEFINITIONS(${QT_DEFINITIONS})
+ENDIF(WANT_PCH)
+
+ADD_DEFINITIONS(${TRAVERSO_DEFINES})
+SET(TRAVERSO_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/buildfiles)
+
#Add our source subdirs
ADD_SUBDIRECTORY(src)
Index: cmake/modules/FindPCHSupport.cmake
===================================================================
RCS file: /sources/traverso/traverso/cmake/modules/FindPCHSupport.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cmake/modules/FindPCHSupport.cmake 5 Nov 2007 15:56:24 -0000 1.1
+++ cmake/modules/FindPCHSupport.cmake 19 Nov 2007 14:04:24 -0000 1.2
@@ -45,6 +45,7 @@
-I${CMAKE_SOURCE_DIR}/src/common
-I${CMAKE_SOURCE_DIR}/src/traverso/songcanvas
${QT_DEFINITIONS}
+ ${TRAVERSO_DEFINES}
-x c++-header
-o ${_output} ${_source}
DEPENDS ${_source} )
Index: src/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/CMakeLists.txt 5 Nov 2007 22:28:10 -0000 1.2
+++ src/CMakeLists.txt 19 Nov 2007 14:04:25 -0000 1.3
@@ -1,11 +1,11 @@
-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)
+ADD_SUBDIRECTORY(engine ${TRAVERSO_BUILD_DIR})
+ADD_SUBDIRECTORY(audiofileio ${TRAVERSO_BUILD_DIR})
+ADD_SUBDIRECTORY(commands ${TRAVERSO_BUILD_DIR})
+ADD_SUBDIRECTORY(core ${TRAVERSO_BUILD_DIR})
+ADD_SUBDIRECTORY(3rdparty ${TRAVERSO_BUILD_DIR})
+ADD_SUBDIRECTORY(plugins ${TRAVERSO_BUILD_DIR})
+ADD_SUBDIRECTORY(traverso/songcanvas ${TRAVERSO_BUILD_DIR})
+ADD_SUBDIRECTORY(traverso ${TRAVERSO_BUILD_DIR})
IF(USE_PCH)
ADD_PRECOMPILED_HEADER(precompiled_headers precompile.h)
Index: src/commands/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/commands/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/commands/CMakeLists.txt 5 Nov 2007 22:28:11 -0000 1.3
+++ src/commands/CMakeLists.txt 19 Nov 2007 14:04:25 -0000 1.4
@@ -1,4 +1,4 @@
-ADD_SUBDIRECTORY(plugins ${CMAKE_SOURCE_DIR}/src/bin)
+ADD_SUBDIRECTORY(plugins ${TRAVERSO_BUILD_DIR})
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/commands
Index: src/commands/plugins/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/commands/plugins/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/commands/plugins/CMakeLists.txt 5 Nov 2007 15:52:10 -0000 1.1
+++ src/commands/plugins/CMakeLists.txt 19 Nov 2007 14:04:25 -0000 1.2
@@ -1 +1 @@
-ADD_SUBDIRECTORY(TraversoCommands ${CMAKE_SOURCE_DIR}/src/bin)
+ADD_SUBDIRECTORY(TraversoCommands ${TRAVERSO_BUILD_DIR})
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso CMakeLists.txt cmake/modules/FindPCHSu...,
Remon Sijrier <=