diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-06-03 19:52:30 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-06-03 19:52:30 +0000 |
| commit | 7f4b50dd0e00bdd6fc4aaf512085f12c37bffdb6 (patch) | |
| tree | f6ac298c76885fbc7a7d266dc8113ca46ccec7bb /modules | |
| parent | e13e219d9a24e4379bcf80c40e55ab89359fbcc9 (diff) | |
| download | extra-cmake-modules-7f4b50dd0e00bdd6fc4aaf512085f12c37bffdb6.tar.gz extra-cmake-modules-7f4b50dd0e00bdd6fc4aaf512085f12c37bffdb6.tar.bz2 | |
hmmm, that optimization with skipping basically everything on a second run has its problems, e.g. if
an OPTION() is added later on it doesn't get noticed because it is skipped
so, this is not really a fix, it just excludes the options from being skipped
Alex
svn path=/trunk/KDE/kdelibs/; revision=816406
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index a0f0bc7f..9eec524f 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -229,10 +229,8 @@ if(COMMAND CMAKE_POLICY) endif(COMMAND CMAKE_POLICY) - -if(KDE4_FOUND) - # Already found in this cmake run, nothing more to do -else(KDE4_FOUND) +# Only do something if it hasn't been found yet +if(NOT KDE4_FOUND) include (MacroEnsureVersion) @@ -494,6 +492,7 @@ else (_kdeBootStrapping) endif (_kdeBootStrapping) +endif(NOT KDE4_FOUND) ##################### provide some options ########################################## @@ -501,6 +500,12 @@ option(KDE4_ENABLE_FINAL "Enable final all-in-one compilation") option(KDE4_BUILD_TESTS "Build the tests") option(KDE4_ENABLE_HTMLHANDBOOK "Create targets htmlhandbook for creating the html versions of the docbook docs") +# this one enables the smaller link interface for libs on UNIX (exceot OSX) +if(UNIX )# AND NOT APPLE) + option(KDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT "Enable the experimental reduced library exports" FALSE) +endif(UNIX)# AND NOT APPLE) + + if( KDE4_ENABLE_FINAL) add_definitions(-DKDE_USE_FINAL) endif(KDE4_ENABLE_FINAL) @@ -513,6 +518,9 @@ option(KDE4_ENABLE_FPIE "Enable platform supports PIE linking") set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) + +if(NOT KDE4_FOUND) + ########## the following are directories where stuff will be installed to ########### # # this has to be after find_xxx() block above, since there KDELibsDependencies.cmake is included @@ -1119,5 +1127,5 @@ if (NOT _kde4_uninstall_rule_created) endif (NOT _kde4_uninstall_rule_created) -endif(KDE4_FOUND) +endif(NOT KDE4_FOUND) |