diff options
| author | Petri Lehtinen <petri@digip.org> | 2013-06-09 22:18:05 -0700 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2013-06-09 22:18:05 -0700 |
| commit | 018f7fea315e6695fa9bd16036ebc50a1506322c (patch) | |
| tree | a8967aa7241c5f530a54d3caad211797db42cf3d | |
| parent | 042d4b2a6be53adb7d68c6c74e8ba9adefe8aa66 (diff) | |
| parent | 2fd66fab1afe78eb1add6b2ba6ffb1934aa30dd1 (diff) | |
| download | jansson-018f7fea315e6695fa9bd16036ebc50a1506322c.zip jansson-018f7fea315e6695fa9bd16036ebc50a1506322c.tar.gz jansson-018f7fea315e6695fa9bd16036ebc50a1506322c.tar.bz2 | |
Merge pull request #120 from paulharris/mine_pre_2.5
Adjust CMakeLists.txt and .def: add _d postfix onto jansson_d.lib/dll
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/jansson.def | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7f8da4..cdad582 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,14 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) +# Give the debug version a different postfix for windows, +# so both the debug and release version can be built in the +# same build-tree on Windows (MSVC). +IF (WIN32) + SET (CMAKE_DEBUG_POSTFIX "_d") +ELSE (WIN32) +ENDIF (WIN32) + # This is how I thought it should go # set (JANSSON_VERSION "2.3.1") # set (JANSSON_SOVERSION 2) diff --git a/src/jansson.def b/src/jansson.def index 6b2c8a7..8cc2e9c 100644 --- a/src/jansson.def +++ b/src/jansson.def @@ -1,5 +1,3 @@ -LIBRARY "jansson" - EXPORTS json_delete json_true |