From: <su...@us...> - 2008-09-12 05:37:24
|
Revision: 2990 http://tora.svn.sourceforge.net/tora/?rev=2990&view=rev Author: subik Date: 2008-09-12 05:37:35 +0000 (Fri, 12 Sep 2008) Log Message: ----------- version bump Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-09-12 05:32:53 UTC (rev 2989) +++ trunk/tora/CMakeLists.txt 2008-09-12 05:37:35 UTC (rev 2990) @@ -36,8 +36,8 @@ #Set our version values #Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX} #where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) -SET (VERSION_MAJOR "1") -SET (VERSION_MINOR "4") +SET (VERSION_MAJOR "2") +SET (VERSION_MINOR "0") SET (VERSION_PATCH "0") SET (VERSION_SUFFIX "svn") SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <m0...@us...> - 2008-10-08 10:55:28
|
Revision: 3043 http://tora.svn.sourceforge.net/tora/?rev=3043&view=rev Author: m0m Date: 2008-10-08 10:55:19 +0000 (Wed, 08 Oct 2008) Log Message: ----------- added rpm packaging target Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-10-08 09:37:30 UTC (rev 3042) +++ trunk/tora/CMakeLists.txt 2008-10-08 10:55:19 UTC (rev 3043) @@ -291,3 +291,38 @@ TODO DESTINATION ${TORA_DOC_DIR} ) + +# packaging related stuff +#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") +SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) +#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") +#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") +SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") +SET(CPACK_SOURCE_GENERATOR "TGZ") +#SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +INCLUDE(CPack) + +# Check for SVN and get current revision +IF (EXISTS ${CMAKE_SOURCE_DIR}/.svn) + # TODO: automatically set the revision on windows + IF(NOT WIN32) + FIND_PACKAGE(Subversion) + IF(Subversion_FOUND) + Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TORA) + ENDIF(Subversion_FOUND) + MESSAGE("-- Current SVN revision is ${TORA_WC_REVISION}") + ENDIF(NOT WIN32) +ENDIF (EXISTS ${CMAKE_SOURCE_DIR}/.svn) + +SET(RPM_DEFINES + --define "_version ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" + --define "_release 0.${TORA_WC_REVISION}svn" + --define "_sourcedir ${CMAKE_SOURCE_DIR}" + ) +SET(RPM_SPEC "rpm/tora.spec.in") +ADD_CUSTOM_TARGET(package-rpm + COMMAND make package_source + COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}" + ) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <m0...@us...> - 2008-10-08 14:59:55
|
Revision: 3052 http://tora.svn.sourceforge.net/tora/?rev=3052&view=rev Author: m0m Date: 2008-10-08 14:59:46 +0000 (Wed, 08 Oct 2008) Log Message: ----------- added more files into CPACK_IGNORE_FILES Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-10-08 11:50:20 UTC (rev 3051) +++ trunk/tora/CMakeLists.txt 2008-10-08 14:59:46 UTC (rev 3052) @@ -301,6 +301,8 @@ SET(CPACK_SOURCE_GENERATOR "TGZ") #SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt") +SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) INCLUDE(CPack) # Check for SVN and get current revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <m0...@us...> - 2008-10-08 15:01:18
|
Revision: 3053 http://tora.svn.sourceforge.net/tora/?rev=3053&view=rev Author: m0m Date: 2008-10-08 15:01:12 +0000 (Wed, 08 Oct 2008) Log Message: ----------- I'd like get svn revision in rpmbuild time not in Makefile generation time Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-10-08 14:59:46 UTC (rev 3052) +++ trunk/tora/CMakeLists.txt 2008-10-08 15:01:12 UTC (rev 3053) @@ -305,21 +305,19 @@ SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) INCLUDE(CPack) -# Check for SVN and get current revision -IF (EXISTS ${CMAKE_SOURCE_DIR}/.svn) - # TODO: automatically set the revision on windows - IF(NOT WIN32) - FIND_PACKAGE(Subversion) - IF(Subversion_FOUND) - Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TORA) - ENDIF(Subversion_FOUND) - MESSAGE("-- Current SVN revision is ${TORA_WC_REVISION}") - ENDIF(NOT WIN32) -ENDIF (EXISTS ${CMAKE_SOURCE_DIR}/.svn) +# Check for SVN +FIND_PACKAGE(Subversion) +IF(NOT Subversion_FOUND) + SET(Subversion_SVN_EXECUTABLE true) +ENDIF(NOT Subversion_FOUND) +# get svn revision in rpmbuild time (and not in Makefile generation time) +SET(SVN_REVISION + "\"$$(" ${Subversion_SVN_EXECUTABLE} info | awk '/Revision:/ {print \$\$2 }' ")\"" + ) SET(RPM_DEFINES --define "_version ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" - --define "_release 0.${TORA_WC_REVISION}svn" + --define "_release 0.${SVN_REVISION}svn" --define "_sourcedir ${CMAKE_SOURCE_DIR}" ) SET(RPM_SPEC "rpm/tora.spec.in") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-10-31 14:14:57
|
Revision: 3067 http://tora.svn.sourceforge.net/tora/?rev=3067&view=rev Author: mrjohnson0 Date: 2008-10-31 14:14:47 +0000 (Fri, 31 Oct 2008) Log Message: ----------- clear svn version suffix Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-10-29 15:24:31 UTC (rev 3066) +++ trunk/tora/CMakeLists.txt 2008-10-31 14:14:47 UTC (rev 3067) @@ -39,7 +39,7 @@ SET (VERSION_MAJOR "2") SET (VERSION_MINOR "0") SET (VERSION_PATCH "0") -SET (VERSION_SUFFIX "svn") +SET (VERSION_SUFFIX "") SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <m0...@us...> - 2008-12-02 13:26:20
|
Revision: 3099 http://tora.svn.sourceforge.net/tora/?rev=3099&view=rev Author: m0m Date: 2008-12-02 13:26:14 +0000 (Tue, 02 Dec 2008) Log Message: ----------- sync version in cmake with configure (see r3095) Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-12-02 08:43:33 UTC (rev 3098) +++ trunk/tora/CMakeLists.txt 2008-12-02 13:26:14 UTC (rev 3099) @@ -37,7 +37,7 @@ #Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX} #where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) SET (VERSION_MAJOR "2") -SET (VERSION_MINOR "0") +SET (VERSION_MINOR "1") SET (VERSION_PATCH "0") SET (VERSION_SUFFIX "") SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2009-09-26 19:58:59
|
Revision: 3318 http://tora.svn.sourceforge.net/tora/?rev=3318&view=rev Author: subik Date: 2009-09-26 19:58:51 +0000 (Sat, 26 Sep 2009) Log Message: ----------- fixed typos Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2009-09-25 21:50:59 UTC (rev 3317) +++ trunk/tora/CMakeLists.txt 2009-09-26 19:58:51 UTC (rev 3318) @@ -54,9 +54,9 @@ MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") SET (EXE_NAME "tora") -if (ENABLE_BUNDLE) +if (WANT_BUNDLE) SET(EXE_NAME "TOra") -endif(ENABLE_BUNDLE) +endif(WANT_BUNDLE) ADD_DEFINITIONS("-DTOVERSION=\\\"${VERSION}\\\"") # Allow using CMAKE-related ifdefs in the code. See e.g. toqsqlconnection.cpp. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2010-04-12 07:50:30
|
Revision: 3502 http://tora.svn.sourceforge.net/tora/?rev=3502&view=rev Author: subik Date: 2010-04-12 07:50:24 +0000 (Mon, 12 Apr 2010) Log Message: ----------- implementation of 'make dist' for cmake (tgz/tgz2) Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2010-04-11 10:15:15 UTC (rev 3501) +++ trunk/tora/CMakeLists.txt 2010-04-12 07:50:24 UTC (rev 3502) @@ -331,20 +331,24 @@ ENDIF (NOT WANT_BUNDLE) +# packaging related stuff +#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") +# SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) +string(TOLOWER ${CMAKE_PROJECT_NAME} CPACK_PACKAGE_NAME) +#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") +#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") +SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") +SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2") +#SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt;refresh-copyright-and-license.pl") +SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) +INCLUDE(CPack) +# simulate autotools' "make dist" +add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) + + IF (WANT_RPM) - # packaging related stuff - #SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") - SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) - #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") - #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") - SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") - SET(CPACK_SOURCE_GENERATOR "TGZ") - #SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") - SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") - SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt") - SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) - INCLUDE(CPack) - # Check for SVN FIND_PACKAGE(Subversion) IF(NOT Subversion_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2010-05-23 08:57:33
|
Revision: 3540 http://tora.svn.sourceforge.net/tora/?rev=3540&view=rev Author: subik Date: 2010-05-23 08:57:26 +0000 (Sun, 23 May 2010) Log Message: ----------- fixed devel warnings for ./loki linking Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2010-05-23 08:56:17 UTC (rev 3539) +++ trunk/tora/CMakeLists.txt 2010-05-23 08:57:26 UTC (rev 3540) @@ -24,6 +24,7 @@ cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros cmake_policy(SET CMP0011 NEW) + cmake_policy(SET CMP0015 NEW) endif(COMMAND cmake_policy) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2010-06-14 17:46:29
|
Revision: 3571 http://tora.svn.sourceforge.net/tora/?rev=3571&view=rev Author: subik Date: 2010-06-14 17:46:23 +0000 (Mon, 14 Jun 2010) Log Message: ----------- potential fix for missing cmake policies Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2010-06-11 10:52:00 UTC (rev 3570) +++ trunk/tora/CMakeLists.txt 2010-06-14 17:46:23 UTC (rev 3571) @@ -22,10 +22,18 @@ # handle new cmake versions correctly if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) - cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros - cmake_policy(SET CMP0011 NEW) - cmake_policy(SET CMP0015 NEW) + if (POLICY CMP0003) + cmake_policy(SET CMP0003 NEW) + endif (POLICY CMP0003) + if (POLICY CMP0005) + cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros + endif (POLICY CMP0005) + if (POLICY CMP0011) + cmake_policy(SET CMP0011 NEW) + endif (POLICY CMP0011) + if (POLICY CMP0015) + cmake_policy(SET CMP0015 NEW) + endif (POLICY CMP0015) endif(COMMAND cmake_policy) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2010-06-25 10:12:52
|
Revision: 3589 http://tora.svn.sourceforge.net/tora/?rev=3589&view=rev Author: ibre5041 Date: 2010-06-25 10:12:46 +0000 (Fri, 25 Jun 2010) Log Message: ----------- use precompiled headers by default, use debug build when requested Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2010-06-25 09:36:08 UTC (rev 3588) +++ trunk/tora/CMakeLists.txt 2010-06-25 10:12:46 UTC (rev 3589) @@ -12,7 +12,7 @@ OPTION(WANT_BUNDLE "Enable Mac OS X bundle build" OFF) OPTION(WANT_BUNDLE_STANDALONE "Do not copy required libs and tools into bundle (WANT_BUNDLE)" ON) OPTION(USE_TROTL "Use trotl OCI wrapper library" OFF) -OPTION(USE_PCH "Use percompiled headers" OFF) +OPTION(USE_PCH "Use percompiled headers" ON) #Set our CMake minimum version #Require 2.4.2 for Qt finding @@ -135,9 +135,13 @@ #Convert our simpler command line option to the CMake style #None, Debug, Release, .. or custom ones +IF(WANT_DEBUG) + SET(CMAKE_BUILD_TYPE Debug) + ADD_DEFINITIONS("-DDEBUG") +ELSE(WANT_DEBUG) SET(CMAKE_BUILD_TYPE RELEASE) +ENDIF(WANT_DEBUG) - # Lets disable Wall warnings due the MSVC too much talkative # output. Wall can slow down compiletion up to hours and # my boxes can boil eggs too. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2010-08-17 17:57:32
|
Revision: 3659 http://tora.svn.sourceforge.net/tora/?rev=3659&view=rev Author: subik Date: 2010-08-17 17:57:26 +0000 (Tue, 17 Aug 2010) Log Message: ----------- find boost in non-usr/lib systems (mac) for DEBUG builds Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2010-08-16 10:06:40 UTC (rev 3658) +++ trunk/tora/CMakeLists.txt 2010-08-17 17:57:26 UTC (rev 3659) @@ -138,6 +138,16 @@ IF(WANT_DEBUG) SET(CMAKE_BUILD_TYPE Debug) ADD_DEFINITIONS("-DDEBUG") + + # Boost headers are required to compile with -DDEBUG (see tologger.h) + FIND_PACKAGE(Boost) + IF (Boost_FOUND) + MESSAGE(STATUS "Found Boost libraries for debug build") + include_directories(${Boost_INCLUDE_DIRS}) + else (Boost_FOUND) + MESSAGE(FATAL "Boost libs not found. It's mandatory to build with debugging") + ENDIF (Boost_FOUND) + ELSE(WANT_DEBUG) SET(CMAKE_BUILD_TYPE RELEASE) ENDIF(WANT_DEBUG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-04-24 17:01:47
|
Revision: 4278 http://tora.svn.sourceforge.net/tora/?rev=4278&view=rev Author: ibre5041 Date: 2012-04-24 17:01:37 +0000 (Tue, 24 Apr 2012) Log Message: ----------- VERSION macro is not used anymore Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2012-04-24 16:52:38 UTC (rev 4277) +++ trunk/tora/CMakeLists.txt 2012-04-24 17:01:37 UTC (rev 4278) @@ -87,7 +87,6 @@ SET(EXE_NAME "TOra") endif(WANT_BUNDLE) -ADD_DEFINITIONS("-DVERSION=\\\"${VERSION}\\\"") # Allow using CMAKE-related ifdefs in the code. See e.g. toqsqlconnection.cpp. ADD_DEFINITIONS("-DCMAKE_BUILD") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-09-25 10:40:45
|
Revision: 5138 http://sourceforge.net/p/tora/code/5138 Author: ibre5041 Date: 2014-09-25 10:40:40 +0000 (Thu, 25 Sep 2014) Log Message: ----------- Gentoo build fix - 1st try Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2014-07-29 15:20:49 UTC (rev 5137) +++ trunk/tora/CMakeLists.txt 2014-09-25 10:40:40 UTC (rev 5138) @@ -103,10 +103,12 @@ ########## check for the CPU we build for ########## IF (CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic") - SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic -ggdb3") - SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic") - SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic -ggdb3") + SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -rdynamic") + SET(CMAKE_C_FLAGS_DEBUG "-O0 -fno-inline -rdynamic") + SET(CMAKE_CXX_FLAGS_RELEASE "-O2") + SET(CMAKE_C_FLAGS_RELEASE "-O2") + SET(CMAKE_CXX_FLAGS "-Wall -std=c++0x -ggdb3") + SET(CMAKE_C_FLAGS "-Wall -std=c++0x -ggdb3") ENDIF (CMAKE_COMPILER_IS_GNUCC) #Convert our simpler command line option to the CMake style This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-09-27 00:09:43
|
Revision: 5139 http://sourceforge.net/p/tora/code/5139 Author: ibre5041 Date: 2014-09-27 00:09:31 +0000 (Sat, 27 Sep 2014) Log Message: ----------- Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2014-09-25 10:40:40 UTC (rev 5138) +++ trunk/tora/CMakeLists.txt 2014-09-27 00:09:31 UTC (rev 5139) @@ -108,7 +108,7 @@ SET(CMAKE_CXX_FLAGS_RELEASE "-O2") SET(CMAKE_C_FLAGS_RELEASE "-O2") SET(CMAKE_CXX_FLAGS "-Wall -std=c++0x -ggdb3") - SET(CMAKE_C_FLAGS "-Wall -std=c++0x -ggdb3") + SET(CMAKE_C_FLAGS "-Wall -ggdb3") ENDIF (CMAKE_COMPILER_IS_GNUCC) #Convert our simpler command line option to the CMake style This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-11-03 17:14:20
|
Revision: 5143 http://sourceforge.net/p/tora/code/5143 Author: ibre5041 Date: 2014-11-03 17:14:16 +0000 (Mon, 03 Nov 2014) Log Message: ----------- makefile: changed default flags This way we can compile with new compilers that support c++11 fully, which doesn't allow syntax which is used in this project Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2014-11-03 17:06:59 UTC (rev 5142) +++ trunk/tora/CMakeLists.txt 2014-11-03 17:14:16 UTC (rev 5143) @@ -107,7 +107,7 @@ SET(CMAKE_C_FLAGS_DEBUG "-O0 -fno-inline -rdynamic") SET(CMAKE_CXX_FLAGS_RELEASE "-O2") SET(CMAKE_C_FLAGS_RELEASE "-O2") - SET(CMAKE_CXX_FLAGS "-Wall -std=c++0x -ggdb3") + SET(CMAKE_CXX_FLAGS "-Wall -std=c++03 -ggdb3") SET(CMAKE_C_FLAGS "-Wall -ggdb3") ENDIF (CMAKE_COMPILER_IS_GNUCC) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-11-25 22:53:44
|
Revision: 5168 http://sourceforge.net/p/tora/code/5168 Author: ibre5041 Date: 2014-11-25 22:53:35 +0000 (Tue, 25 Nov 2014) Log Message: ----------- qt5 module path Modified Paths: -------------- trunk/tora/CMakeLists.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2014-11-25 22:33:49 UTC (rev 5167) +++ trunk/tora/CMakeLists.txt 2014-11-25 22:53:35 UTC (rev 5168) @@ -166,7 +166,8 @@ #SET(CMAKE_AUTOMOC ON) if(QT5_BUILD) set (QT_FOUND true) - #set (CMAKE_PREFIX_PATH "C:\\Qt\\5.3\\msvc2013\\") + #set(CMAKE_PREFIX_PATH "$ENV{QTDIR}\\5.3\\msvc2013\\") # multiple paths do not work + set(CMAKE_PREFIX_PATH "$ENV{QTDIR}\\5.3\\msvc2013_64_opengl\\") find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) find_package(Qt5Network REQUIRED) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |