Re: Problem with CMake and package.C

[Peter Kümmel]

Abdelrazak Younes wrote:
> Hi Peter,
> 
> package.C contains the following:
> 
> string const top_srcdir()
> {
>     static string const dir("%TOP_SRCDIR%");
>     return dir;
> }
> 
> 
> string const hardcoded_localedir()
> {
>     return string("%LOCALEDIR%");
> }
> 
> 
> string const hardcoded_system_support_dir()
> {
>     return string("%LYX_DIR%");
> }
> 
> 
> These should be replaced at configure time, shouldn't they?

Yes.

> 
> Abdel.
> 

I've applied this patch:

Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt      (revision 16341)
+++ CMakeLists.txt      (working copy)
@@ -83,6 +83,17 @@
        endif(noconsole)
 endif(WIN32)

+set(LYX_DIR         "${CMAKE_SOURCE_DIR}/../../lib")
+set(TOP_SRCDIR      "${CMAKE_SOURCE_DIR}/../..")
+set(PROGRAM_SUFFIX  "")
+set(LOCALEDIR       "")
+
+message("----- LYX_DIR       : ${LYX_DIR}")
+message("----- TOP_SRCDIR    : ${TOP_SRCDIR}")
+message("----- PROGRAM_SUFFIX: ${PROGRAM_SUFFIX}")
+message("----- LOCALEDIR     : ${LOCALEDIR}")
+
+
 message("")

But I don't know the right values, so please fix it.

Additionally cmake needs @VAR@ instead of %VAR% to
get VAR replaced with its value.
Doesn't configure also work with @? Then please commit
attached patch.

-- 
Peter Kümmel

Index: package.C.in
===================================================================
--- package.C.in        (revision 16341)
+++ package.C.in        (working copy)
@@ -172,28 +172,28 @@
 // configuration-time.
 string const top_srcdir()
 {
-       static string const dir("%TOP_SRCDIR%");
+       static string const dir("@TOP_SRCDIR@");
        return dir;
 }
 
 
 string const hardcoded_localedir()
 {
-       return string("%LOCALEDIR%");
+       return string("@LOCALEDIR@");
 }
 
 
 string const hardcoded_system_support_dir()
 {
-       return string("%LYX_DIR%");
+       return string("@LYX_DIR@");
 }
 
 
 string const & with_version_suffix()
 {
-       static string const program_suffix("%PROGRAM_SUFFIX%");
+       static string const program_suffix("@PROGRAM_SUFFIX@");
        static string const
-               with_version_suffix(" --with-version-suffix=%PROGRAM_SUFFIX%");
+               with_version_suffix(" [EMAIL PROTECTED]@");
        return program_suffix.empty() ? program_suffix : with_version_suffix;
 }
 
@@ -202,7 +202,7 @@
 
 string const & Package::top_srcdir() const
 {
-       static string const dir("%TOP_SRCDIR%");
+       static string const dir("@TOP_SRCDIR@");
        return dir;
 }