don't overwrite the command line value

[lyx.git] / development / cmake / CMakeLists.txt

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 9f9f02f9d8e5a6348c1db39ca0b5a7f2a633b9ef..c2708c95b7db81d24250eb710adcff2fdc24a435 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -1,11 +1,15 @@
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
 
+if(NOT CODE_GROUP_NAME)
+set(CODE_GROUP_NAME "The Golden Code")
+endif(NOT CODE_GROUP_NAME)
+
 include(LyXPaths)
 include(LyXMacros)
 
 if(release)
-       set(CMAKE_BUILD_TYPE TRUE)
+       set(CMAKE_BUILD_TYPE Release)
        set(release)
 endif(release) 
 
@@ -30,14 +34,8 @@ else(qt3)
 endif(qt3)     
 
 find_package(ZLIB REQUIRED)
-
-
-if(all OR nls)
-       find_package(ICONV REQUIRED)
-else(all OR nls)
-       find_package(ICONV)
-endif(all OR nls)
-set(nls)
+find_package(ICONV REQUIRED)
+add_definitions(-DHAVE_ICONV=1)
 
 if(all OR aspell)
        find_package(ASPELL REQUIRED)
@@ -47,12 +45,13 @@ endif(all OR aspell)
 set(aspell)
 
 message("")
-if(ICONV_FOUND)
-       add_definitions(-DENABLE_NLS=1 -DHAVE_ICONV=1)
-       message("----- Building with ENABLE_NLS and HAVE_ICONV")
-else(ICONV_FOUND)
-       message("----- No iconv found, to get more information use -Dnls=1")
-endif(ICONV_FOUND)
+if(nls OR all)
+       add_definitions(-DENABLE_NLS=1)
+       message("----- Building with ENABLE_NLS")
+else(nls OR all)       
+       message("----- No nls, to enable use -Dnls=1")
+endif(nls OR all)
+set(nls)
 if(ASPELL_FOUND)
        add_definitions(-DUSE_ASPELL=1)
        message("----- Building with USE_ASPELL")