diff options
| author | David Athay <ko2fan@gmail.com> | 2010-07-23 17:53:19 -0500 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2010-07-23 17:53:19 -0500 |
| commit | ca41ffae88c1363a04e3c3ed6b84511e865af4f6 (patch) | |
| tree | cbe287c4dc08a1125ae1751bba1dfab9a30a6f38 | |
| parent | 74d7248ead98717f5e4da1b2bf8eeaf9c4628fa0 (diff) | |
| parent | 94067246b02a981e3e3b058120551beb8a830c7e (diff) | |
| download | mana-ca41ffae88c1363a04e3c3ed6b84511e865af4f6.tar.gz mana-ca41ffae88c1363a04e3c3ed6b84511e865af4f6.tar.bz2 mana-ca41ffae88c1363a04e3c3ed6b84511e865af4f6.tar.xz mana-ca41ffae88c1363a04e3c3ed6b84511e865af4f6.zip | |
Merge branch '1.0' of gitorious.org:mana/mana into 1.0
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 15a55d91..b396b8e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ ENDIF() STRING(REPLACE "." " " _VERSION ${VERSION}) SEPARATE_ARGUMENTS(_VERSION) LIST(LENGTH _VERSION _LEN) -IF(NOT (_LEN EQUAL 4 OR _LEN EQUAL 3)) +IF(NOT _LEN EQUAL 4 AND NOT _LEN EQUAL 3) MESSAGE(FATAL_ERROR "Version needs to be in the form MAJOR.MINOR.RELEASE[.BUILD]") ENDIF() @@ -70,4 +70,4 @@ IF(WIN32) SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/setup_welcome.bmp") SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.manasource.org") ENDIF() -INCLUDE(CPack)
\ No newline at end of file +INCLUDE(CPack) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b15948d3..9b38b496 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,8 +32,8 @@ ENDIF() IF (CMAKE_BUILD_TYPE) STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) - IF((CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) OR - (CMAKE_BUILD_TYPE_TOLOWER MATCHES relwithdebinfo)) + IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug OR + CMAKE_BUILD_TYPE_TOLOWER MATCHES relwithdebinfo) SET(FLAGS "${FLAGS} -DDEBUG") ENDIF() ENDIF() |