fix build-in dictionary

knopkem · Jul 26, 2020 · 37a6c22 · 37a6c22
1 parent 293f958
commit 37a6c22
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake
@@ -132,7 +132,7 @@ if(WIN32 OR MINGW)
   option(DCMTK_ENABLE_BUILTIN_DICTIONARY "Configure DCMTK with compiled-in data dictionary." ON)
   option(DCMTK_ENABLE_EXTERNAL_DICTIONARY "Configure DCMTK to load external dictionary from default path on startup." ON)
 else() # built-in dictionary turned off on Unix per default
-  option(DCMTK_ENABLE_BUILTIN_DICTIONARY "Configure DCMTK with compiled-in data dictionary." OFF)
+  option(DCMTK_ENABLE_BUILTIN_DICTIONARY "Configure DCMTK with compiled-in data dictionary." ON)
   option(DCMTK_ENABLE_EXTERNAL_DICTIONARY "Configure DCMTK to load external dictionary from default path on startup." ON)
 endif()
 if (NOT DCMTK_ENABLE_EXTERNAL_DICTIONARY AND NOT DCMTK_ENABLE_BUILTIN_DICTIONARY)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,7 +67,6 @@ else()
     message(STATUS "GNU or Clang detected, adding compile flags")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wconversion -Wfloat-equal -fPIC")
     set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-    set (DCMTK_ENABLE_BUILDIN_DICTIONARY TRUE)
 endif()
 
 #-----------------------------------------------------------------------------
@@ -113,3 +112,5 @@ target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})
 
 # define NPI_VERSION
 add_definitions(-DNAPI_VERSION=4)
+
+
diff --git a/config/configure.in b/config/configure.in
@@ -977,7 +977,6 @@ AC_ARG_ENABLE(builtin-dict,
 [ case "$enableval" in
   yes)
     AC_MSG_RESULT(yes)
-    DCMTK_ENABLE_BUILTIN_DICTIONARY=true
     AC_DEFINE(ENABLE_BUILTIN_DICTIONARY, , [Define if we are compiling with built-in (compiled-in) dictionary enabled.])
     ;;
   *)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dicom-dimse-native",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "native addon using DCMTK dicom toolkit",
   "main": "index.js",
   "scripts": {