Changeset 1645 for trunk/Clp/examples/Makefile.in

Timestamp:

Dec 4, 2010 2:32:08 PM (10 years ago)

Author:

stefan

Message:

get examples working for cygwin/cl without pkg-config

File:

• trunk/Clp/examples/Makefile.in (modified) (3 diffs)

trunk/Clp/examples/Makefile.in

@@ -38 +38 @@
 ##########################################################################
 
+COIN_HAS_PKGCONFIG = @COIN_HAS_PKGCONFIG_TRUE@TRUE
+COIN_CXX_IS_CL = @COIN_CXX_IS_CL_TRUE@TRUE
+COIN_HAS_SAMPLE = @COIN_HAS_SAMPLE_TRUE@TRUE
+COIN_HAS_NETLIB = @COIN_HAS_NETLIB_TRUE@TRUE
+
 # C++ Compiler command
 CXX = @CXX@
@@ -43 +48 @@
 # C++ Compiler options
 CXXFLAGS = @CXXFLAGS@
-@COIN_HAS_SAMPLE_TRUE@CXXFLAGS += -DSAMPLEDIR=\"@SAMPLE_DATA@\"
-@COIN_HAS_NETLIB_TRUE@CXXFLAGS += -DNETLIBDIR=\"@NETLIB_DATA@\"
 
 # additional C++ Compiler options for linking
@@ -54 +57 @@
 # C Compiler options
 CFLAGS = @CFLAGS@
-@COIN_HAS_SAMPLE_TRUE@CFLAGS += -DSAMPLEDIR=\"@SAMPLE_DATA@\"
-@COIN_HAS_NETLIB_TRUE@CFLAGS += -DNETLIBDIR=\"@NETLIB_DATA@\"
 
-# Compiler flags (we use the CYGPATH_W variables to allow compilation with Windows compilers)
-@COIN_HAS_PKGCONFIG_TRUE@INCL = `PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --cflags clp` $(ADDINCFLAGS)
-@COIN_HAS_PKGCONFIG_FALSE@INCL = @CLPLIB_CFLAGS_INSTALLED@ $(ADDINCFLAGS)
+# Sample data directory
+ifeq ($(COIN_HAS_SAMPLE), TRUE)
+  ifeq ($(COIN_HAS_PKGCONFIG), TRUE)
+    CXXFLAGS += -DSAMPLEDIR=\"`PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --variable=datadir coindatasample`\"
+      CFLAGS += -DSAMPLEDIR=\"`PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --variable=datadir coindatasample`\"
+  else
+    CXXFLAGS += -DSAMPLEDIR=\"@SAMPLE_DATA_INSTALLED@\"
+      CFLAGS += -DSAMPLEDIR=\"@SAMPLE_DATA_INSTALLED@\"
+  endif
+endif
+
+ifeq ($(COIN_HAS_NETLIB), TRUE)
+  ifeq ($(COIN_HAS_PKGCONFIG), TRUE)
+    CXXFLAGS += -DNETLIBDIR=\"`PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --variable=datadir coindatanetlib`\"
+      CFLAGS += -DNETLIBDIR=\"`PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --variable=datadir coindatanetlib`\"
+  else
+    CXXFLAGS += -DNETLIBDIR=\"@NETLIB_DATA_INSTALLED@\"
+      CFLAGS += -DNETLIBDIR=\"@NETLIB_DATA_INSTALLED@\"
+  endif
+endif
+
+# Include directories (we use the CYGPATH_W variables to allow compilation with Windows compilers)
+ifeq ($(COIN_HAS_PKGCONFIG), TRUE)
+  INCL = `PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --cflags clp`
+else
+  INCL = @CLPLIB_CFLAGS_INSTALLED@
+endif
+INCL += $(ADDINCFLAGS)
 
 # Linker flags
-@COIN_HAS_PKGCONFIG_TRUE@@COIN_CXX_IS_CL_FALSE@LIBS = `PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --libs clp`
-@COIN_HAS_PKGCONFIG_TRUE@@COIN_CXX_IS_CL_TRUE@LIBS = /link: `PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --msvc-syntax --libs clp`
-@COIN_HAS_PKGCONFIG_FALSE@LIBS = -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@
+ifeq ($(COIN_HAS_PKGCONFIG), TRUE)
+  LIBS = `PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --libs clp`
+else
+  ifeq ($(COIN_CXX_IS_CL), TRUE)
+    LIBS = /link /libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@
+  else
+    LIBS = -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@
+  endif
+endif
 
 # The following is necessary under cygwin, if native compilers are used